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 2002/11/25 19:12:05 UTC
cvs commit: xml-xalan/c/src/XSLT AVT.cpp AVT.hpp AVTPart.cpp AVTPart.hpp AVTPartSimple.cpp AVTPartSimple.hpp AVTPartXPath.cpp AVTPartXPath.hpp Constants.cpp Constants.hpp CountersTable.cpp CountersTable.hpp DecimalToRoman.hpp ElemApplyImport.cpp ElemApplyImport.hpp ElemApplyTemplates.cpp ElemApplyTemplates.hpp ElemAttribute.cpp ElemAttribute.hpp ElemAttributeSet.cpp ElemAttributeSet.hpp ElemCallTemplate.cpp ElemCallTemplate.hpp ElemChoose.cpp ElemChoose.hpp ElemComment.cpp ElemComment.hpp ElemCopy.cpp ElemCopy.hpp ElemCopyOf.cpp ElemCopyOf.hpp ElemDecimalFormat.cpp ElemDecimalFormat.hpp ElemElement.cpp ElemElement.hpp ElemEmpty.cpp ElemEmpty.hpp ElemExtensionCall.cpp ElemExtensionCall.hpp ElemFallback.cpp ElemFallback.hpp ElemForEach.cpp ElemForEach.hpp ElemIf.cpp ElemIf.hpp ElemLiteralResult.cpp ElemLiteralResult.hpp ElemMessage.cpp ElemMessage.hpp ElemNumber.cpp ElemNumber.hpp ElemOtherwise.cpp ElemOtherwise.hpp ElemPI.cpp ElemPI.hpp ElemParam.cpp ElemParam.hpp ElemSort.cpp ElemSort.hpp ElemTemplate.cpp ElemTemplate.hpp ElemTemplateElement.cpp ElemTemplateElement.hpp ElemText.cpp ElemText.hpp ElemTextLiteral.cpp ElemTextLiteral.hpp ElemUse.cpp ElemUse.hpp ElemValueOf.cpp ElemValueOf.hpp ElemVariable.cpp ElemVariable.hpp ElemWhen.cpp ElemWhen.hpp ElemWithParam.cpp ElemWithParam.hpp ExtensionFunctionHandler.cpp ExtensionFunctionHandler.hpp ExtensionNSHandler.cpp ExtensionNSHandler.hpp FunctionCurrent.cpp FunctionCurrent.hpp FunctionDocument.cpp FunctionDocument.hpp FunctionElementAvailable.cpp FunctionElementAvailable.hpp FunctionFormatNumber.cpp FunctionFormatNumber.hpp FunctionFunctionAvailable.cpp FunctionFunctionAvailable.hpp FunctionGenerateID.cpp FunctionGenerateID.hpp FunctionKey.cpp FunctionKey.hpp FunctionSystemProperty.cpp FunctionSystemProperty.hpp FunctionUnparsedEntityURI.cpp FunctionUnparsedEntityURI.hpp GenerateEvent.cpp GenerateEvent.hpp KeyDeclaration.hpp KeyTable.cpp KeyTable.hpp NamespacesHandler.cpp NamespacesHandler.hpp NodeSortKey.cpp NodeSortKey.hpp NodeSorter.cpp NodeSorter.hpp OutputContextStack.cpp OutputContextStack.hpp ProblemListener.cpp ProblemListener.hpp ProblemListenerDefault.cpp ProblemListenerDefault.hpp ResultNamespacesStack.cpp ResultNamespacesStack.hpp ResultTreeFrag.cpp ResultTreeFrag.hpp ResultTreeFragAllocator.cpp ResultTreeFragAllocator.hpp ResultTreeFragBaseNodeRefListBaseProxy.cpp ResultTreeFragBaseNodeRefListBaseProxy.hpp SelectionEvent.cpp SelectionEvent.hpp Stylesheet.cpp Stylesheet.hpp StylesheetConstructionContext.cpp StylesheetConstructionContext.hpp StylesheetConstructionContextDefault.cpp StylesheetConstructionContextDefault.hpp StylesheetExecutionContext.cpp StylesheetExecutionContext.hpp StylesheetExecutionContextDefault.cpp StylesheetExecutionContextDefault.hpp StylesheetHandler.cpp StylesheetHandler.hpp StylesheetRoot.cpp StylesheetRoot.hpp TopLevelArg.cpp TopLevelArg.hpp TraceListener.cpp TraceListener.hpp TraceListenerDefault.cpp TraceListenerDefault.hpp TracerEvent.cpp TracerEvent.hpp VariablesStack.cpp VariablesStack.hpp XResultTreeFrag.cpp XResultTreeFrag.hpp XResultTreeFragAllocator.cpp XResultTreeFragAllocator.hpp XSLTDefinitions.hpp XSLTEngineImpl.cpp XSLTEngineImpl.hpp XSLTInit.cpp XSLTInit.hpp XSLTInputSource.cpp XSLTInputSource.hpp XSLTProcessor.cpp XSLTProcessor.hpp XSLTProcessorEnvSupport.cpp XSLTProcessorEnvSupport.hpp XSLTProcessorEnvSupportDefault.cpp XSLTProcessorEnvSupportDefault.hpp XSLTProcessorException.cpp XSLTProcessorException.hpp XSLTResultTarget.cpp XSLTResultTarget.hpp XalanAVTAllocator.cpp XalanAVTAllocator.hpp XalanAVTPartSimpleAllocator.cpp XalanAVTPartSimpleAllocator.hpp XalanAVTPartXPathAllocator.cpp XalanAVTPartXPathAllocator.hpp XalanElemApplyTemplatesAllocator.cpp XalanElemApplyTemplatesAllocator.hpp XalanElemAttributeAllocator.cpp XalanElemAttributeAllocator.hpp XalanElemAttributeSetAllocator.cpp XalanElemAttributeSetAllocator.hpp XalanElemCallTemplateAllocator.cpp XalanElemCallTemplateAllocator.hpp XalanElemElementAllocator.cpp XalanElemElementAllocator.hpp XalanElemEmptyAllocator.cpp XalanElemEmptyAllocator.hpp XalanElemLiteralResultAllocator.cpp XalanElemLiteralResultAllocator.hpp XalanElemTemplateAllocator.cpp XalanElemTemplateAllocator.hpp XalanElemTextAllocator.cpp XalanElemTextAllocator.hpp XalanElemTextLiteralAllocator.cpp XalanElemTextLiteralAllocator.hpp XalanElemValueOfAllocator.cpp XalanElemValueOfAllocator.hpp XalanElemVariableAllocator.cpp XalanElemVariableAllocator.hpp XalanNumberingResourceBundle.cpp XalanNumberingResourceBundle.hpp XalanSourceTreeDocumentAllocator.cpp XalanSourceTreeDocumentAllocator.hpp XalanSourceTreeDocumentFragmentAllocator.cpp XalanSourceTreeDocumentFragmentAllocator.hpp XalanTemplate.cpp
dbertoni 2002/11/25 10:12:04
Modified: c/src/XSLT AVT.cpp AVT.hpp AVTPart.cpp AVTPart.hpp
AVTPartSimple.cpp AVTPartSimple.hpp
AVTPartXPath.cpp AVTPartXPath.hpp Constants.cpp
Constants.hpp CountersTable.cpp CountersTable.hpp
DecimalToRoman.hpp ElemApplyImport.cpp
ElemApplyImport.hpp ElemApplyTemplates.cpp
ElemApplyTemplates.hpp ElemAttribute.cpp
ElemAttribute.hpp ElemAttributeSet.cpp
ElemAttributeSet.hpp ElemCallTemplate.cpp
ElemCallTemplate.hpp ElemChoose.cpp ElemChoose.hpp
ElemComment.cpp ElemComment.hpp ElemCopy.cpp
ElemCopy.hpp ElemCopyOf.cpp ElemCopyOf.hpp
ElemDecimalFormat.cpp ElemDecimalFormat.hpp
ElemElement.cpp ElemElement.hpp ElemEmpty.cpp
ElemEmpty.hpp ElemExtensionCall.cpp
ElemExtensionCall.hpp ElemFallback.cpp
ElemFallback.hpp ElemForEach.cpp ElemForEach.hpp
ElemIf.cpp ElemIf.hpp ElemLiteralResult.cpp
ElemLiteralResult.hpp ElemMessage.cpp
ElemMessage.hpp ElemNumber.cpp ElemNumber.hpp
ElemOtherwise.cpp ElemOtherwise.hpp ElemPI.cpp
ElemPI.hpp ElemParam.cpp ElemParam.hpp ElemSort.cpp
ElemSort.hpp ElemTemplate.cpp ElemTemplate.hpp
ElemTemplateElement.cpp ElemTemplateElement.hpp
ElemText.cpp ElemText.hpp ElemTextLiteral.cpp
ElemTextLiteral.hpp ElemUse.cpp ElemUse.hpp
ElemValueOf.cpp ElemValueOf.hpp ElemVariable.cpp
ElemVariable.hpp ElemWhen.cpp ElemWhen.hpp
ElemWithParam.cpp ElemWithParam.hpp
ExtensionFunctionHandler.cpp
ExtensionFunctionHandler.hpp ExtensionNSHandler.cpp
ExtensionNSHandler.hpp FunctionCurrent.cpp
FunctionCurrent.hpp FunctionDocument.cpp
FunctionDocument.hpp FunctionElementAvailable.cpp
FunctionElementAvailable.hpp
FunctionFormatNumber.cpp FunctionFormatNumber.hpp
FunctionFunctionAvailable.cpp
FunctionFunctionAvailable.hpp
FunctionGenerateID.cpp FunctionGenerateID.hpp
FunctionKey.cpp FunctionKey.hpp
FunctionSystemProperty.cpp
FunctionSystemProperty.hpp
FunctionUnparsedEntityURI.cpp
FunctionUnparsedEntityURI.hpp GenerateEvent.cpp
GenerateEvent.hpp KeyDeclaration.hpp KeyTable.cpp
KeyTable.hpp NamespacesHandler.cpp
NamespacesHandler.hpp NodeSortKey.cpp
NodeSortKey.hpp NodeSorter.cpp NodeSorter.hpp
OutputContextStack.cpp OutputContextStack.hpp
ProblemListener.cpp ProblemListener.hpp
ProblemListenerDefault.cpp
ProblemListenerDefault.hpp
ResultNamespacesStack.cpp ResultNamespacesStack.hpp
ResultTreeFrag.cpp ResultTreeFrag.hpp
ResultTreeFragAllocator.cpp
ResultTreeFragAllocator.hpp
ResultTreeFragBaseNodeRefListBaseProxy.cpp
ResultTreeFragBaseNodeRefListBaseProxy.hpp
SelectionEvent.cpp SelectionEvent.hpp
Stylesheet.cpp Stylesheet.hpp
StylesheetConstructionContext.cpp
StylesheetConstructionContext.hpp
StylesheetConstructionContextDefault.cpp
StylesheetConstructionContextDefault.hpp
StylesheetExecutionContext.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetHandler.cpp StylesheetHandler.hpp
StylesheetRoot.cpp StylesheetRoot.hpp
TopLevelArg.cpp TopLevelArg.hpp TraceListener.cpp
TraceListener.hpp TraceListenerDefault.cpp
TraceListenerDefault.hpp TracerEvent.cpp
TracerEvent.hpp VariablesStack.cpp
VariablesStack.hpp XResultTreeFrag.cpp
XResultTreeFrag.hpp XResultTreeFragAllocator.cpp
XResultTreeFragAllocator.hpp XSLTDefinitions.hpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp XSLTInit.cpp
XSLTInit.hpp XSLTInputSource.cpp
XSLTInputSource.hpp XSLTProcessor.cpp
XSLTProcessor.hpp XSLTProcessorEnvSupport.cpp
XSLTProcessorEnvSupport.hpp
XSLTProcessorEnvSupportDefault.cpp
XSLTProcessorEnvSupportDefault.hpp
XSLTProcessorException.cpp
XSLTProcessorException.hpp XSLTResultTarget.cpp
XSLTResultTarget.hpp XalanAVTAllocator.cpp
XalanAVTAllocator.hpp
XalanAVTPartSimpleAllocator.cpp
XalanAVTPartSimpleAllocator.hpp
XalanAVTPartXPathAllocator.cpp
XalanAVTPartXPathAllocator.hpp
XalanElemApplyTemplatesAllocator.cpp
XalanElemApplyTemplatesAllocator.hpp
XalanElemAttributeAllocator.cpp
XalanElemAttributeAllocator.hpp
XalanElemAttributeSetAllocator.cpp
XalanElemAttributeSetAllocator.hpp
XalanElemCallTemplateAllocator.cpp
XalanElemCallTemplateAllocator.hpp
XalanElemElementAllocator.cpp
XalanElemElementAllocator.hpp
XalanElemEmptyAllocator.cpp
XalanElemEmptyAllocator.hpp
XalanElemLiteralResultAllocator.cpp
XalanElemLiteralResultAllocator.hpp
XalanElemTemplateAllocator.cpp
XalanElemTemplateAllocator.hpp
XalanElemTextAllocator.cpp
XalanElemTextAllocator.hpp
XalanElemTextLiteralAllocator.cpp
XalanElemTextLiteralAllocator.hpp
XalanElemValueOfAllocator.cpp
XalanElemValueOfAllocator.hpp
XalanElemVariableAllocator.cpp
XalanElemVariableAllocator.hpp
XalanNumberingResourceBundle.cpp
XalanNumberingResourceBundle.hpp
XalanSourceTreeDocumentAllocator.cpp
XalanSourceTreeDocumentAllocator.hpp
XalanSourceTreeDocumentFragmentAllocator.cpp
XalanSourceTreeDocumentFragmentAllocator.hpp
XalanTemplate.cpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.20 +11 -3 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AVT.cpp 3 Nov 2002 03:41:05 -0000 1.19
+++ AVT.cpp 25 Nov 2002 18:11:51 -0000 1.20
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMChar theTokenDelimiterCharacters[] =
{
XalanUnicode::charLeftCurlyBracket,
@@ -112,7 +116,7 @@
*/
AVT::AVT(
StylesheetConstructionContext& constructionContext,
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver) :
@@ -344,7 +348,7 @@
void
AVT::nextToken(
StylesheetConstructionContext& constructionContext,
- const Locator* locator,
+ const LocatorType* locator,
StringTokenizer& tokenizer,
XalanDOMString& token)
{
@@ -360,3 +364,7 @@
tokenizer.nextToken(token);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +19 -11 xml-xalan/c/src/XSLT/AVT.hpp
Index: AVT.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVT.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AVT.hpp 14 Nov 2002 17:24:57 -0000 1.16
+++ AVT.hpp 25 Nov 2002 18:11:51 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,13 +57,6 @@
#if !defined(XALAN_AVT_HEADER_GUARD)
#define XALAN_AVT_HEADER_GUARD
-/**
- * $Id$
- *
- * $State$
- *
- */
-
// Base include file. Must be first.
#include <XSLT/XSLTDefinitions.hpp>
@@ -73,8 +66,19 @@
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
+
+
class AVTPart;
-class Locator;
class PrefixResolver;
class XPathExecutionContext;
class XalanNode;
@@ -109,7 +113,7 @@
*/
AVT(
StylesheetConstructionContext& constructionContext,
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver);
@@ -157,7 +161,7 @@
void
nextToken(
StylesheetConstructionContext& constructionContext,
- const Locator* locator,
+ const LocatorType* locator,
StringTokenizer& tokenizer,
XalanDOMString& token);
@@ -184,6 +188,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/AVTPart.cpp
Index: AVTPart.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVTPart.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AVTPart.cpp 18 Dec 1999 19:48:02 -0000 1.1
+++ AVTPart.cpp 25 Nov 2002 18:11:51 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
AVTPart::AVTPart()
{
}
@@ -67,3 +71,7 @@
AVTPart::~AVTPart()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2 xml-xalan/c/src/XSLT/AVTPart.hpp
Index: AVTPart.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVTPart.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AVTPart.hpp 21 Sep 2002 01:24:41 -0000 1.5
+++ AVTPart.hpp 25 Nov 2002 18:11:51 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanDOMString;
class XalanNode;
class PrefixResolver;
@@ -104,6 +108,10 @@
const PrefixResolver& prefixResolver,
XPathExecutionContext& executionContext) const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2 xml-xalan/c/src/XSLT/AVTPartSimple.cpp
Index: AVTPartSimple.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVTPartSimple.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AVTPartSimple.cpp 31 Oct 2002 07:15:56 -0000 1.5
+++ AVTPartSimple.cpp 25 Nov 2002 18:11:51 -0000 1.6
@@ -64,8 +64,12 @@
#include "StylesheetConstructionContext.hpp"
-
-
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Simple string part of a complex AVT.
*/
@@ -91,3 +95,7 @@
{
append(buf, m_val, m_len);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/XSLT/AVTPartSimple.hpp
Index: AVTPartSimple.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVTPartSimple.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AVTPartSimple.hpp 31 Oct 2002 07:15:56 -0000 1.6
+++ AVTPartSimple.hpp 25 Nov 2002 18:11:51 -0000 1.7
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class StylesheetConstructionContext;
@@ -119,6 +123,10 @@
const XalanDOMString::size_type m_len;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 xml-xalan/c/src/XSLT/AVTPartXPath.cpp
Index: AVTPartXPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVTPartXPath.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AVTPartXPath.cpp 6 Jun 2001 21:55:15 -0000 1.8
+++ AVTPartXPath.cpp 25 Nov 2002 18:11:51 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Construct a simple AVT part.
* @param val A pure string section of an AVT.
@@ -103,3 +107,7 @@
xobj->str(buf);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2 xml-xalan/c/src/XSLT/AVTPartXPath.hpp
Index: AVTPartXPath.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVTPartXPath.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AVTPartXPath.hpp 6 Jun 2001 21:55:15 -0000 1.6
+++ AVTPartXPath.hpp 25 Nov 2002 18:11:51 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class PrefixResolver;
class XPath;
class XPathEnvSupport;
@@ -122,6 +126,10 @@
*/
const XPath* const m_pXPath;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.26 +9 -0 xml-xalan/c/src/XSLT/Constants.cpp
Index: Constants.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Constants.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Constants.cpp 3 Oct 2002 06:00:27 -0000 1.25
+++ Constants.cpp 25 Nov 2002 18:11:51 -0000 1.26
@@ -64,6 +64,7 @@
#include <PlatformSupport/DOMStringHelper.hpp>
+XALAN_USING_XALAN(XalanDOMString)
static XalanDOMString ATTRNAME_CASEORDER;
static XalanDOMString ATTRNAME_COUNT;
@@ -186,6 +187,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString& Constants::ATTRNAME_CASEORDER = ::ATTRNAME_CASEORDER;
const XalanDOMString& Constants::ATTRNAME_COUNT = ::ATTRNAME_COUNT;
const XalanDOMString& Constants::ATTRNAME_DATATYPE = ::ATTRNAME_DATATYPE;
@@ -553,3 +558,7 @@
releaseMemory(::PSEUDONAME_NODE);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.24 +9 -0 xml-xalan/c/src/XSLT/Constants.hpp
Index: Constants.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Constants.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Constants.hpp 3 Oct 2002 06:00:28 -0000 1.23
+++ Constants.hpp 25 Nov 2002 18:11:51 -0000 1.24
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Primary constants used in the XSLTProcessor classes.
*/
@@ -235,6 +239,11 @@
// This is used for trace reporting.
static const XalanDOMString& PSEUDONAME_NODE;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // XALAN_CONSTANTS_HEADER_GUARD
1.6 +11 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CountersTable.cpp 7 Nov 2002 01:48:50 -0000 1.5
+++ CountersTable.cpp 25 Nov 2002 18:11:52 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,15 +67,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
inline void
appendBtoFList(
CountersTable::NodeVectorType& flist,
const CountersTable::NodeVectorType& blist)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
- using std::copy;
-#endif
+ XALAN_USING_STD(back_inserter)
+ XALAN_USING_STD(copy)
flist.reserve(flist.size() + blist.size());
@@ -208,3 +210,7 @@
return result;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +13 -4 xml-xalan/c/src/XSLT/CountersTable.hpp
Index: CountersTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/CountersTable.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CountersTable.hpp 7 Nov 2002 01:48:50 -0000 1.7
+++ CountersTable.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemNumber;
class StylesheetExecutionContext;
@@ -94,7 +98,7 @@
{
typedef unsigned long CountType;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanNode*> NodeVectorType;
#else
typedef std::vector<XalanNode*> NodeVectorType;
@@ -186,7 +190,7 @@
typedef Counter::CountType CountType;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<Counter> CounterVectorType;
typedef vector<CounterVectorType> ElemCounterVectorVectorType;
#else
@@ -259,6 +263,11 @@
*/
NodeVectorType m_newFound;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // !defined(XALAN_COUNTERSTABLE_HEADER_GUARD_1357924680)
1.7 +8 -0 xml-xalan/c/src/XSLT/DecimalToRoman.hpp
Index: DecimalToRoman.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/DecimalToRoman.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DecimalToRoman.hpp 7 Nov 2002 18:57:02 -0000 1.6
+++ DecimalToRoman.hpp 25 Nov 2002 18:11:52 -0000 1.7
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Structure to help in converting integrals to roman numerals
*/
@@ -85,6 +89,10 @@
XalanDOMChar m_preLetter[eMaxLetter + 1];
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +10 -2 xml-xalan/c/src/XSLT/ElemApplyImport.cpp
Index: ElemApplyImport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyImport.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemApplyImport.cpp 3 Nov 2002 03:41:05 -0000 1.18
+++ ElemApplyImport.cpp 25 Nov 2002 18:11:52 -0000 1.19
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,10 +80,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemApplyImport::ElemApplyImport(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -147,3 +151,7 @@
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +12 -11 xml-xalan/c/src/XSLT/ElemApplyImport.hpp
Index: ElemApplyImport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyImport.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemApplyImport.hpp 9 Mar 2001 16:20:09 -0000 1.9
+++ ElemApplyImport.hpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,23 +57,20 @@
#if !defined(XALAN_ELEMAPPLYIMPORT_HEADER_GUARD)
#define XALAN_ELEMAPPLYIMPORT_HEADER_GUARD
-/**
- * $Id$
- *
- * $State$
- *
- * @author Myriam Midy (Myriam_Midy @lotus.com
- */
+
// Base include file. Must be first.
-#include "XSLTDefinitions.hpp"
+#include <XSLT/XSLTDefinitions.hpp>
// Base class header file.
-#include "ElemTemplateElement.hpp"
+#include <XSLT/ElemTemplateElement.hpp>
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -93,7 +90,7 @@
ElemApplyImport(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -112,6 +109,10 @@
private:
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.29 +9 -1 xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp
Index: ElemApplyTemplates.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ElemApplyTemplates.cpp 6 Nov 2002 05:09:48 -0000 1.28
+++ ElemApplyTemplates.cpp 25 Nov 2002 18:11:52 -0000 1.29
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanQNameByValue s_defaultMode;
@@ -82,7 +86,7 @@
ElemApplyTemplates::ElemApplyTemplates(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ParentType(
@@ -224,3 +228,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +11 -11 xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp
Index: ElemApplyTemplates.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemApplyTemplates.hpp 6 Nov 2002 05:09:48 -0000 1.14
+++ ElemApplyTemplates.hpp 25 Nov 2002 18:11:52 -0000 1.15
@@ -57,21 +57,17 @@
#if !defined(XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD)
#define XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD
-/**
- * $Id$
- *
- * $State$
- *
- * @author Myriam Midy (Myriam_Midy @lotus.com
- */
-
// Base include file. Must be first.
-#include "XSLTDefinitions.hpp"
+#include <XSLT/XSLTDefinitions.hpp>
// Base class header file.
-#include "ElemForEach.hpp"
+#include <XSLT/ElemForEach.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -97,7 +93,7 @@
ElemApplyTemplates(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -121,6 +117,10 @@
const XalanQName* m_mode;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.43 +11 -3 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ElemAttribute.cpp 6 Nov 2002 05:09:48 -0000 1.42
+++ ElemAttribute.cpp 25 Nov 2002 18:11:52 -0000 1.43
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,10 +78,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemAttribute::ElemAttribute(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -144,7 +148,7 @@
void
-ElemAttribute::execute(StylesheetExecutionContext& executionContext) const
+ElemAttribute::execute(StylesheetExecutionContext& executionContext) const
{
assert(m_nameAVT != 0);
@@ -429,3 +433,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -11 xml-xalan/c/src/XSLT/ElemAttribute.hpp
Index: ElemAttribute.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemAttribute.hpp 6 Nov 2002 05:09:48 -0000 1.11
+++ ElemAttribute.hpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,15 +57,6 @@
#if !defined(XALAN_ELEMATTRIBUTE_HEADER_GUARD)
#define XALAN_ELEMATTRIBUTE_HEADER_GUARD
-/**
- * $Id$
- *
- *
- * $State$
- *
- * @author Myriam Midy (Myriam_Midy @lotus.com
- */
-
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
@@ -76,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AVT;
class ElemTextLiteral;
@@ -97,7 +92,7 @@
ElemAttribute (
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -126,6 +121,10 @@
const AVT* m_nameAVT;
const AVT* m_namespaceAVT;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.23 +9 -1 xml-xalan/c/src/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ElemAttributeSet.cpp 3 Nov 2002 03:41:05 -0000 1.22
+++ ElemAttributeSet.cpp 25 Nov 2002 18:11:52 -0000 1.23
@@ -69,10 +69,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemAttributeSet::ElemAttributeSet(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemUse(constructionContext,
@@ -184,3 +188,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -2 xml-xalan/c/src/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemAttributeSet.hpp 3 Nov 2002 03:41:05 -0000 1.14
+++ ElemAttributeSet.hpp 25 Nov 2002 18:11:52 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemAttributeSet : public ElemUse
{
public:
@@ -85,7 +89,7 @@
ElemAttributeSet (
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -143,6 +147,10 @@
{
return theLHS.getQName() < theRHS.getQName();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.26 +10 -2 xml-xalan/c/src/XSLT/ElemCallTemplate.cpp
Index: ElemCallTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemCallTemplate.cpp 3 Nov 2002 03:41:05 -0000 1.25
+++ ElemCallTemplate.cpp 25 Nov 2002 18:11:52 -0000 1.26
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,10 +76,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemCallTemplate::ElemCallTemplate(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -200,3 +204,7 @@
return false;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +10 -2 xml-xalan/c/src/XSLT/ElemCallTemplate.hpp
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemCallTemplate.hpp 3 Nov 2002 03:41:05 -0000 1.15
+++ ElemCallTemplate.hpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemTemplate;
@@ -89,7 +93,7 @@
ElemCallTemplate (
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -133,6 +137,10 @@
const ElemTemplate* m_template;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.20 +10 -2 xml-xalan/c/src/XSLT/ElemChoose.cpp
Index: ElemChoose.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemChoose.cpp 24 Sep 2002 01:42:34 -0000 1.19
+++ ElemChoose.cpp 25 Nov 2002 18:11:52 -0000 1.20
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,10 +77,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemChoose::ElemChoose(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -191,3 +195,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XSLT/ElemChoose.hpp
Index: ElemChoose.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemChoose.hpp 20 May 2002 18:01:48 -0000 1.11
+++ ElemChoose.hpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemChoose: public ElemTemplateElement
{
public:
@@ -85,7 +89,7 @@
ElemChoose(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -102,6 +106,10 @@
virtual bool
childTypeAllowed(int xslToken) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +10 -2 xml-xalan/c/src/XSLT/ElemComment.cpp
Index: ElemComment.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ElemComment.cpp 24 Sep 2002 01:42:34 -0000 1.16
+++ ElemComment.cpp 25 Nov 2002 18:11:52 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,10 +72,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemComment::ElemComment(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -160,3 +164,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -2 xml-xalan/c/src/XSLT/ElemComment.hpp
Index: ElemComment.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemComment.hpp 9 Mar 2001 16:20:06 -0000 1.9
+++ ElemComment.hpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemComment: public ElemTemplateElement
{
public:
@@ -85,7 +89,7 @@
ElemComment(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -105,6 +109,10 @@
virtual bool
childTypeAllowed(int xslToken) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.20 +10 -2 xml-xalan/c/src/XSLT/ElemCopy.cpp
Index: ElemCopy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemCopy.cpp 24 Sep 2002 01:42:34 -0000 1.19
+++ ElemCopy.cpp 25 Nov 2002 18:11:52 -0000 1.20
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,10 +75,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemCopy::ElemCopy(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemUse(constructionContext,
@@ -166,3 +170,7 @@
executeChildren(executionContext);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -2 xml-xalan/c/src/XSLT/ElemCopy.hpp
Index: ElemCopy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemCopy.hpp 6 Nov 2002 05:09:48 -0000 1.10
+++ ElemCopy.hpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemCopy: public ElemUse
{
public:
@@ -85,7 +89,7 @@
ElemCopy(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -97,6 +101,10 @@
virtual void
execute(StylesheetExecutionContext& executionContext) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +10 -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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElemCopyOf.cpp 6 Nov 2002 05:09:48 -0000 1.29
+++ ElemCopyOf.cpp 25 Nov 2002 18:11:52 -0000 1.30
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,10 +78,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemCopyOf::ElemCopyOf(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -220,3 +224,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +11 -3 xml-xalan/c/src/XSLT/ElemCopyOf.hpp
Index: ElemCopyOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemCopyOf.hpp 6 Nov 2002 05:09:48 -0000 1.13
+++ ElemCopyOf.hpp 25 Nov 2002 18:11:52 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class NodeRefListBase;
class XPath;
@@ -97,7 +101,7 @@
ElemCopyOf(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -113,6 +117,10 @@
const XPath* m_selectPattern;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +10 -2 xml-xalan/c/src/XSLT/ElemDecimalFormat.cpp
Index: ElemDecimalFormat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemDecimalFormat.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemDecimalFormat.cpp 3 Nov 2002 03:41:05 -0000 1.12
+++ ElemDecimalFormat.cpp 25 Nov 2002 18:11:52 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanQNameByValue s_empty;
@@ -83,7 +87,7 @@
ElemDecimalFormat::ElemDecimalFormat(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -316,3 +320,7 @@
{
ElemTemplateElement::execute(executionContext);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +9 -3 xml-xalan/c/src/XSLT/ElemDecimalFormat.hpp
Index: ElemDecimalFormat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemDecimalFormat.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemDecimalFormat.hpp 3 Nov 2002 03:41:05 -0000 1.10
+++ ElemDecimalFormat.hpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -93,7 +97,7 @@
ElemDecimalFormat(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -134,6 +138,8 @@
-#endif // XALAN_ELEMEMPTY_HEADER_GUARD
+XALAN_CPP_NAMESPACE_END
+
+#endif // XALAN_ELEMEMPTY_HEADER_GUARD
1.45 +9 -1 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ElemElement.cpp 12 Nov 2002 19:23:40 -0000 1.44
+++ ElemElement.cpp 25 Nov 2002 18:11:52 -0000 1.45
@@ -74,10 +74,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemElement::ElemElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemUse(constructionContext,
@@ -450,3 +454,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +11 -3 xml-xalan/c/src/XSLT/ElemElement.hpp
Index: ElemElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemElement.hpp 12 Nov 2002 19:23:40 -0000 1.15
+++ ElemElement.hpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AVT;
@@ -96,7 +100,7 @@
ElemElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -166,6 +170,10 @@
const AVT* m_namespaceAVT;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +8 -0 xml-xalan/c/src/XSLT/ElemEmpty.cpp
Index: ElemEmpty.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemEmpty.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemEmpty.cpp 5 Nov 2002 05:19:24 -0000 1.13
+++ ElemEmpty.cpp 25 Nov 2002 18:11:52 -0000 1.14
@@ -65,6 +65,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemEmpty::ElemEmpty(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
@@ -125,3 +129,7 @@
{
return false;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +8 -1 xml-xalan/c/src/XSLT/ElemEmpty.hpp
Index: ElemEmpty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemEmpty.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemEmpty.hpp 27 Sep 2002 23:32:23 -0000 1.11
+++ ElemEmpty.hpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemEmpty : public ElemTemplateElement
{
public:
@@ -128,6 +132,9 @@
};
-#endif // XALAN_ELEMEMPTY_HEADER_GUARD
+XALAN_CPP_NAMESPACE_END
+
+
+#endif // XALAN_ELEMEMPTY_HEADER_GUARD
1.15 +9 -1 xml-xalan/c/src/XSLT/ElemExtensionCall.cpp
Index: ElemExtensionCall.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemExtensionCall.cpp 5 Nov 2002 05:19:24 -0000 1.14
+++ ElemExtensionCall.cpp 25 Nov 2002 18:11:52 -0000 1.15
@@ -65,11 +65,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemExtensionCall::ElemExtensionCall(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
ExtensionNSHandler& ns) :
@@ -112,3 +116,7 @@
{
return executionContext.elementAvailable(m_qname->getNamespace(), m_qname->getLocalPart());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +10 -2 xml-xalan/c/src/XSLT/ElemExtensionCall.hpp
Index: ElemExtensionCall.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemExtensionCall.hpp 5 Nov 2002 05:19:24 -0000 1.12
+++ ElemExtensionCall.hpp 25 Nov 2002 18:11:52 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ExtensionNSHandler;
class XalanQName;
@@ -93,7 +97,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
ExtensionNSHandler& ns);
@@ -112,6 +116,10 @@
ExtensionNSHandler& m_nsh;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +9 -1 xml-xalan/c/src/XSLT/ElemFallback.cpp
Index: ElemFallback.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemFallback.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemFallback.cpp 24 Sep 2002 05:59:38 -0000 1.14
+++ ElemFallback.cpp 25 Nov 2002 18:11:52 -0000 1.15
@@ -75,10 +75,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemFallback::ElemFallback(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -127,3 +131,7 @@
executeChildren(executionContext);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XSLT/ElemFallback.hpp
Index: ElemFallback.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemFallback.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemFallback.hpp 5 Aug 2002 15:39:46 -0000 1.7
+++ ElemFallback.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemFallback : public ElemTemplateElement
{
public:
@@ -84,7 +88,7 @@
ElemFallback(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -107,6 +111,10 @@
ElemFallback&
operator=(const ElemFallback&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +12 -6 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElemForEach.cpp 5 Nov 2002 05:19:24 -0000 1.29
+++ ElemForEach.cpp 25 Nov 2002 18:11:52 -0000 1.30
@@ -87,10 +87,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemForEach::ElemForEach(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -154,9 +158,7 @@
ElemForEach::~ElemForEach()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(m_sortElems.begin(),
m_sortElems.end(),
@@ -169,8 +171,8 @@
ElemForEach::processSortElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& theStylesheet,
- const AttributeList& atts,
- const Locator* locator)
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
const int lineNumber = locator != 0 ? locator->getLineNumber() : -1;
const int columnNumber = locator != 0 ? locator->getColumnNumber() : -1;
@@ -543,3 +545,7 @@
childNode);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +13 -5 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemForEach.hpp 5 Nov 2002 05:19:24 -0000 1.15
+++ ElemForEach.hpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemSort;
class ElemTemplate;
class NodeSorter;
@@ -104,14 +108,14 @@
ElemForEach(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
virtual
~ElemForEach();
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<ElemSort*> SortElemsVectorType;
#else
typedef std::vector<ElemSort*> SortElemsVectorType;
@@ -127,8 +131,8 @@
processSortElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& theStylesheet,
- const AttributeList& atts,
- const Locator* locator = 0);
+ const AttributeListType& atts,
+ const LocatorType* locator = 0);
virtual void
postConstruction(
@@ -213,6 +217,10 @@
SortElemsVectorType::size_type m_sortElemsCount;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +9 -1 xml-xalan/c/src/XSLT/ElemIf.cpp
Index: ElemIf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemIf.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemIf.cpp 24 Sep 2002 05:59:38 -0000 1.21
+++ ElemIf.cpp 25 Nov 2002 18:11:52 -0000 1.22
@@ -80,10 +80,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemIf::ElemIf(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -160,3 +164,7 @@
executeChildren(executionContext);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -10 xml-xalan/c/src/XSLT/ElemIf.hpp
Index: ElemIf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemIf.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemIf.hpp 9 Mar 2001 16:20:01 -0000 1.9
+++ ElemIf.hpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,14 +57,6 @@
#if !defined(XALAN_ELEMIF_HEADER_GUARD)
#define XALAN_ELEMIF_HEADER_GUARD
-/**
- * $Id$
- *
- * $State$
- *
- * @author Myriam Midy (Myriam_Midy @lotus.com
- */
-
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
@@ -75,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -95,7 +91,7 @@
ElemIf(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -111,6 +107,10 @@
const XPath* m_test;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.60 +12 -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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ElemLiteralResult.cpp 12 Nov 2002 19:23:40 -0000 1.59
+++ ElemLiteralResult.cpp 25 Nov 2002 18:11:52 -0000 1.60
@@ -78,11 +78,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemLiteralResult::ElemLiteralResult(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemUse(constructionContext,
@@ -103,7 +107,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
int xslToken) :
@@ -126,7 +130,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts)
+ const AttributeListType& atts)
{
assert(name != 0);
@@ -402,7 +406,7 @@
bool
ElemLiteralResult::isAttrOK(
const XalanDOMChar* attrName,
- const AttributeList& /* atts */,
+ const AttributeListType& /* atts */,
int /* which */,
StylesheetConstructionContext& constructionContext) const
{
@@ -438,3 +442,7 @@
return isAttrOK;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.33 +12 -4 xml-xalan/c/src/XSLT/ElemLiteralResult.hpp
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ElemLiteralResult.hpp 12 Nov 2002 19:23:41 -0000 1.32
+++ ElemLiteralResult.hpp 25 Nov 2002 18:11:52 -0000 1.33
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AVT;
@@ -91,7 +95,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -111,7 +115,7 @@
virtual bool
isAttrOK(
const XalanDOMChar* attrName,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which,
StylesheetConstructionContext& constructionContext) const;
@@ -133,7 +137,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts);
+ const AttributeListType& atts);
/**
* Construct an object corresponding to a literal result element
@@ -150,7 +154,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
int xslToken);
@@ -185,6 +189,10 @@
*/
unsigned int m_avtsCount;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +11 -3 xml-xalan/c/src/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemMessage.cpp 24 Sep 2002 01:42:34 -0000 1.18
+++ ElemMessage.cpp 25 Nov 2002 18:11:52 -0000 1.19
@@ -72,10 +72,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemMessage::ElemMessage(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -140,7 +144,7 @@
executionContext,
theResult.get());
- const Locator* const theLocator = getLocator();
+ const LocatorType* const theLocator = getLocator();
executionContext.message(
theString,
@@ -172,7 +176,7 @@
ElemMessage::ElemMessageTerminateException::ElemMessageTerminateException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage) :
XSLTProcessorException(
theLocator,
@@ -186,3 +190,7 @@
ElemMessage::ElemMessageTerminateException::~ElemMessageTerminateException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XSLT/ElemMessage.hpp
Index: ElemMessage.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemMessage.hpp 10 Sep 2002 06:45:05 -0000 1.11
+++ ElemMessage.hpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemMessage: public ElemTemplateElement
{
public:
@@ -87,7 +91,7 @@
ElemMessage(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -117,7 +121,7 @@
* @param theMessage message to print when exception thrown
*/
ElemMessageTerminateException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage);
virtual
@@ -128,6 +132,10 @@
bool m_terminate;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.70 +24 -24 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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ElemNumber.cpp 7 Nov 2002 18:58:07 -0000 1.69
+++ ElemNumber.cpp 25 Nov 2002 18:11:52 -0000 1.70
@@ -95,16 +95,14 @@
-#if !defined(XALAN_NO_NAMESPACES)
-using std::vector;
-#endif
+XALAN_CPP_NAMESPACE_BEGIN
ElemNumber::ElemNumber(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
unsigned long id) :
@@ -448,11 +446,7 @@
theMatchPatternString.get() = s_piString;
append(theMatchPatternString.get(), contextNode->getNodeName());
-#if defined(XALAN_NO_NAMESPACES)
append(theMatchPatternString.get(), XalanDOMChar(XalanUnicode::charRightParenthesis));
-#else
- append(theMatchPatternString.get(), XalanUnicode::charRightParenthesis);
-#endif
countMatchPattern = executionContext.createMatchPattern(
theMatchPatternString.get(),
@@ -867,6 +861,8 @@
XalanDOMString::size_type numberWidth = 1;
+ XALAN_USING_STD(vector)
+
typedef vector<XalanDOMString> StringVectorType;
typedef StringVectorType::iterator StringVectorTypeIterator;
@@ -1776,11 +1772,11 @@
ELEMNUMBER_SIZE(s_elalphaCountTable);
-static XalanDOMString s_textString;
+static XalanDOMString s_staticTextString;
-static XalanDOMString s_commentString;
+static XalanDOMString s_staticCommentString;
-static XalanDOMString s_slashString;
+static XalanDOMString s_staticSlashString;
@@ -1790,11 +1786,11 @@
0
};
-const XalanDOMString& ElemNumber::s_textString = ::s_textString;
+const XalanDOMString& ElemNumber::s_textString = s_staticTextString;
-const XalanDOMString& ElemNumber::s_commentString = ::s_commentString;
+const XalanDOMString& ElemNumber::s_commentString = s_staticCommentString;
-const XalanDOMString& ElemNumber::s_slashString = ::s_slashString;
+const XalanDOMString& ElemNumber::s_slashString = s_staticSlashString;
const XalanDOMChar ElemNumber::s_piString[] =
{
@@ -1966,10 +1962,10 @@
-static XalanNumberingResourceBundle s_elalphaResourceBundle;
+static XalanNumberingResourceBundle s_staticElalphaResourceBundle;
const XalanNumberingResourceBundle& ElemNumber::s_elalphaResourceBundle =
- ::s_elalphaResourceBundle;
+ s_staticElalphaResourceBundle;
@@ -2083,13 +2079,13 @@
void
ElemNumber::initialize()
{
- ::s_textString = XALAN_STATIC_UCODE_STRING("text()");
+ s_staticTextString = XALAN_STATIC_UCODE_STRING("text()");
- ::s_commentString = XALAN_STATIC_UCODE_STRING("comment()");
+ s_staticCommentString = XALAN_STATIC_UCODE_STRING("comment()");
- ::s_slashString = XALAN_STATIC_UCODE_STRING("/");
+ s_staticSlashString = XALAN_STATIC_UCODE_STRING("/");
- initializeTraditionalElalphaBundle(::s_elalphaResourceBundle);
+ initializeTraditionalElalphaBundle(s_staticElalphaResourceBundle);
}
@@ -2097,9 +2093,13 @@
void
ElemNumber::terminate()
{
- releaseMemory(::s_textString);
- releaseMemory(::s_commentString);
- releaseMemory(::s_slashString);
+ releaseMemory(s_staticTextString);
+ releaseMemory(s_staticCommentString);
+ releaseMemory(s_staticSlashString);
- XalanNumberingResourceBundle().swap(::s_elalphaResourceBundle);
+ XalanNumberingResourceBundle().swap(s_staticElalphaResourceBundle);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.44 +10 -2 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ElemNumber.hpp 7 Nov 2002 18:58:07 -0000 1.43
+++ ElemNumber.hpp 25 Nov 2002 18:11:52 -0000 1.44
@@ -83,6 +83,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AVT;
class MutableNodeRefList;
class XalanNumberFormat;
@@ -104,7 +108,7 @@
eAny
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<CountType> CountTypeArrayType;
#else
typedef std::vector<CountType> CountTypeArrayType;
@@ -135,7 +139,7 @@
ElemNumber(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
unsigned long id);
@@ -554,6 +558,10 @@
private:
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +9 -1 xml-xalan/c/src/XSLT/ElemOtherwise.cpp
Index: ElemOtherwise.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemOtherwise.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemOtherwise.cpp 24 Sep 2002 01:42:34 -0000 1.10
+++ ElemOtherwise.cpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -71,10 +71,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemOtherwise::ElemOtherwise(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -117,3 +121,7 @@
executeChildren(executionContext);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XSLT/ElemOtherwise.hpp
Index: ElemOtherwise.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemOtherwise.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemOtherwise.hpp 16 Apr 2002 05:45:50 -0000 1.7
+++ ElemOtherwise.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemOtherwise: public ElemTemplateElement
{
public:
@@ -85,7 +89,7 @@
ElemOtherwise(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -95,6 +99,10 @@
virtual void
execute(StylesheetExecutionContext& executionContext) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.26 +9 -1 xml-xalan/c/src/XSLT/ElemPI.cpp
Index: ElemPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemPI.cpp 3 Nov 2002 03:41:05 -0000 1.25
+++ ElemPI.cpp 25 Nov 2002 18:11:52 -0000 1.26
@@ -72,10 +72,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemPI::ElemPI(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -190,3 +194,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XSLT/ElemPI.hpp
Index: ElemPI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemPI.hpp 9 Mar 2001 16:19:59 -0000 1.11
+++ ElemPI.hpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AVT;
@@ -90,7 +94,7 @@
ElemPI(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -114,6 +118,10 @@
const AVT* m_nameAVT;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +9 -1 xml-xalan/c/src/XSLT/ElemParam.cpp
Index: ElemParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemParam.cpp 3 Nov 2002 03:41:05 -0000 1.15
+++ ElemParam.cpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -71,10 +71,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemParam::ElemParam(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemVariable(constructionContext,
@@ -118,3 +122,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +9 -1 xml-xalan/c/src/XSLT/ElemParam.hpp
Index: ElemParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemParam.hpp 3 Nov 2002 03:41:05 -0000 1.10
+++ ElemParam.hpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemParam: public ElemVariable
{
public:
@@ -85,7 +89,7 @@
ElemParam(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -97,6 +101,10 @@
virtual void
execute(StylesheetExecutionContext& executionContext) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +9 -1 xml-xalan/c/src/XSLT/ElemSort.cpp
Index: ElemSort.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemSort.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ElemSort.cpp 31 Oct 2002 07:15:56 -0000 1.16
+++ ElemSort.cpp 25 Nov 2002 18:11:52 -0000 1.17
@@ -71,10 +71,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemSort::ElemSort(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -166,3 +170,7 @@
return Constants::ELEMNAME_SORT_WITH_PREFIX_STRING;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XSLT/ElemSort.hpp
Index: ElemSort.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemSort.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemSort.hpp 29 May 2002 18:21:52 -0000 1.8
+++ ElemSort.hpp 25 Nov 2002 18:11:52 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
class AVT;
@@ -95,7 +99,7 @@
ElemSort(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -168,6 +172,10 @@
const AVT* m_orderAVT;
const AVT* m_caseOrderAVT;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.28 +10 -2 xml-xalan/c/src/XSLT/ElemTemplate.cpp
Index: ElemTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ElemTemplate.cpp 3 Nov 2002 03:41:05 -0000 1.27
+++ ElemTemplate.cpp 25 Nov 2002 18:11:52 -0000 1.28
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanQNameByValue s_empty;
@@ -88,7 +92,7 @@
ElemTemplate::ElemTemplate(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -227,3 +231,7 @@
{
ElemTemplateElement::executeChildren(executionContext, sourceNode);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -2 xml-xalan/c/src/XSLT/ElemTemplate.hpp
Index: ElemTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemTemplate.hpp 3 Nov 2002 03:41:05 -0000 1.14
+++ ElemTemplate.hpp 25 Nov 2002 18:11:52 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -91,7 +95,7 @@
ElemTemplate(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -172,6 +176,10 @@
double m_priority;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.88 +13 -5 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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ElemTemplateElement.cpp 14 Nov 2002 17:51:16 -0000 1.87
+++ ElemTemplateElement.cpp 25 Nov 2002 18:11:52 -0000 1.88
@@ -109,6 +109,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString ElemTemplateElement::s_emptyString;
const XalanEmptyNamedNodeMap ElemTemplateElement::s_fakeAttributes;
@@ -176,7 +180,7 @@
-const Locator*
+const LocatorType*
ElemTemplateElement::getLocator() const
{
return &m_locatorProxy;
@@ -195,7 +199,7 @@
bool
ElemTemplateElement::isAttrOK(
const XalanDOMChar* attrName,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which,
StylesheetConstructionContext& constructionContext) const
{
@@ -207,7 +211,7 @@
bool
ElemTemplateElement::processSpaceAttr(
const XalanDOMChar* aname,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which,
StylesheetConstructionContext& constructionContext)
{
@@ -335,8 +339,8 @@
ElemTemplateElement::processSortElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& /* theStylesheet */,
- const AttributeList& /* atts */,
- const Locator* locator)
+ const AttributeListType& /* atts */,
+ const LocatorType* locator)
{
constructionContext.error(
"xsl:sort is not allowed at this position in the stylesheet",
@@ -1416,3 +1420,7 @@
{
return true;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.54 +23 -15 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ElemTemplateElement.hpp 12 Nov 2002 19:23:41 -0000 1.53
+++ ElemTemplateElement.hpp 25 Nov 2002 18:11:52 -0000 1.54
@@ -89,7 +89,20 @@
-class AttributeList;
+XALAN_DECLARE_XERCES_CLASS(AttributeList)
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
+
+
class ElemTemplate;
class ElemTextLiteral;
class NamespacesHandler;
@@ -146,7 +159,7 @@
*
* @return The Locator for the node.
*/
- virtual const Locator*
+ virtual const LocatorType*
getLocator() const;
/**
@@ -162,7 +175,7 @@
virtual bool
isAttrOK(
const XalanDOMChar* attrName,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which,
StylesheetConstructionContext& constructionContext) const;
@@ -178,7 +191,7 @@
bool
processSpaceAttr(
const XalanDOMChar* aname,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which,
StylesheetConstructionContext& constructionContext);
@@ -364,8 +377,8 @@
processSortElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& theStylesheet,
- const AttributeList& atts,
- const Locator* locator = 0);
+ const AttributeListType& atts,
+ const LocatorType* locator = 0);
/**
* Sets a flag indicating this is the default template
@@ -375,15 +388,6 @@
virtual void
setDefaultTemplate(bool value);
-#if defined(XALAN_NO_NAMESPACES)
- typedef map<XalanDOMString,
- XalanDOMString,
- less<XalanDOMString> > StringToStringMapType;
-#else
- typedef std::map<XalanDOMString,
- XalanDOMString> StringToStringMapType;
-#endif
-
/**
* Get the namespaces handler for this element.
*
@@ -1005,6 +1009,10 @@
bool
operator==(const ElemTemplateElement&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +9 -1 xml-xalan/c/src/XSLT/ElemText.cpp
Index: ElemText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemText.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemText.cpp 6 Nov 2002 05:09:48 -0000 1.10
+++ ElemText.cpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* This primarily acts as a marker on the element
* stack to signal that whitespace should be preserved.
@@ -79,7 +83,7 @@
ElemText::ElemText(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -134,3 +138,7 @@
{
return false;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -11 xml-xalan/c/src/XSLT/ElemText.hpp
Index: ElemText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemText.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemText.hpp 6 Nov 2002 05:09:48 -0000 1.7
+++ ElemText.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -2,7 +2,7 @@
The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,15 +57,6 @@
#if !defined(XALAN_ELEMTEXT_HEADER_GUARD)
#define XALAN_ELEMTEXT_HEADER_GUARD
-/**
- * $Id$
- *
- * $State$
- *
- * @author Myriam Midy (Myriam_Midy @lotus.com
- */
-
-
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
@@ -77,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* This primarily acts as a marker on the element
* stack to signal that whitespace should be preserved.
@@ -97,7 +92,7 @@
ElemText(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -127,6 +122,10 @@
private:
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +8 -0 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemTextLiteral.cpp 6 Nov 2002 05:09:48 -0000 1.21
+++ ElemTextLiteral.cpp 25 Nov 2002 18:11:52 -0000 1.22
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemTextLiteral::ElemTextLiteral(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
@@ -134,3 +138,7 @@
executionContext.charactersRaw(m_ch, 0, m_length);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +9 -1 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ElemTextLiteral.hpp 6 Nov 2002 05:09:48 -0000 1.16
+++ ElemTextLiteral.hpp 25 Nov 2002 18:11:52 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemTextLiteral : public ElemTemplateElement
{
public:
@@ -150,6 +154,10 @@
const XalanDOMChar* const m_ch;
const XalanDOMString::size_type m_length;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +10 -34 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemUse.cpp 31 Oct 2002 07:15:56 -0000 1.21
+++ ElemUse.cpp 25 Nov 2002 18:11:52 -0000 1.22
@@ -70,11 +70,16 @@
+#include "Constants.hpp"
#include "StylesheetRoot.hpp"
#include "StylesheetConstructionContext.hpp"
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* This acts as a superclass for ElemCopy, ElemAttributeSet,
* ElemElement, and ElemLiteralResult, on order to implement
@@ -163,7 +168,7 @@
ElemUse::processUseAttributeSets(
StylesheetConstructionContext& constructionContext,
const XalanDOMChar* attrName,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which)
{
bool isUAS = false;
@@ -182,7 +187,6 @@
if(isUAS == true)
{
-#if 1
m_attributeSetsNames =
constructionContext.tokenizeQNames(
m_attributeSetsNamesCount,
@@ -190,39 +194,11 @@
getStylesheet().getNamespaces(),
getLocator());
assert(m_attributeSetsNamesCount == 0 || m_attributeSetsNames != 0);
-#else
- const XalanDOMChar* const qnames = atts.getValue(which);
-
- StringTokenizer tokenizer(qnames);
-
- m_attributeSetsNamesCount = tokenizer.countTokens();
-
- if (m_attributeSetsNamesCount > 0)
- {
- m_attributeSetsNames = constructionContext.allocateQNamePointerVector(m_attributeSetsNamesCount);
-
- const StylesheetConstructionContext::GetAndReleaseCachedString theGuard(constructionContext);
-
- XalanDOMString& qname = theGuard.get();
-
- size_type theCurrentIndex = 0;
-
- while(tokenizer.hasMoreTokens())
- {
- tokenizer.nextToken(qname);
- assert(length(qname) != 0);
-
- m_attributeSetsNames[theCurrentIndex++] =
- constructionContext.createQNameByValue(
- qname,
- getStylesheet().getNamespaces(),
- getLocator());
- }
-
- assert(theCurrentIndex == m_attributeSetsNamesCount);
- }
-#endif
}
return isUAS;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.21 +7 -3 xml-xalan/c/src/XSLT/ElemUse.hpp
Index: ElemUse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemUse.hpp 14 Nov 2002 17:24:58 -0000 1.20
+++ ElemUse.hpp 25 Nov 2002 18:11:52 -0000 1.21
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,7 @@
-#include "Constants.hpp"
+XALAN_CPP_NAMESPACE_BEGIN
@@ -117,7 +117,7 @@
processUseAttributeSets(
StylesheetConstructionContext& constructionContext,
const XalanDOMChar* attrName,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which);
// These methods are inherited from ElemTemplateElement ...
@@ -155,6 +155,10 @@
size_type m_attributeSetsNamesCount;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.34 +10 -2 xml-xalan/c/src/XSLT/ElemValueOf.cpp
Index: ElemValueOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ElemValueOf.cpp 7 Nov 2002 21:44:37 -0000 1.33
+++ ElemValueOf.cpp 25 Nov 2002 18:11:52 -0000 1.34
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,10 +84,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemValueOf::ElemValueOf(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -284,3 +288,7 @@
thePattern,
theValue));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +10 -2 xml-xalan/c/src/XSLT/ElemValueOf.hpp
Index: ElemValueOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemValueOf.hpp 7 Nov 2002 21:44:37 -0000 1.15
+++ ElemValueOf.hpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObjectPtr;
class XPath;
@@ -90,7 +94,7 @@
ElemValueOf(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -132,6 +136,10 @@
*/
const XPath* m_selectPattern;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.29 +12 -4 xml-xalan/c/src/XSLT/ElemVariable.cpp
Index: ElemVariable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ElemVariable.cpp 3 Nov 2002 03:41:05 -0000 1.28
+++ ElemVariable.cpp 25 Nov 2002 18:11:52 -0000 1.29
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,10 +78,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemVariable::ElemVariable(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ParentType(
@@ -104,7 +108,7 @@
ElemVariable::ElemVariable(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
int xslToken) :
@@ -135,7 +139,7 @@
ElemVariable::init(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts)
+ const AttributeListType& atts)
{
const unsigned int nAttrs = atts.getLength();
@@ -307,3 +311,7 @@
return theValue;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +13 -5 xml-xalan/c/src/XSLT/ElemVariable.hpp
Index: ElemVariable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemVariable.hpp 3 Nov 2002 03:41:05 -0000 1.18
+++ ElemVariable.hpp 25 Nov 2002 18:11:52 -0000 1.19
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,6 +82,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -104,7 +108,7 @@
ElemVariable(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -160,7 +164,7 @@
ElemVariable(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber,
int xslToken);
@@ -176,7 +180,7 @@
init(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts);
+ const AttributeListType& atts);
const XalanQName* m_qname;
@@ -197,6 +201,10 @@
XalanNode* m_varContext;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +10 -2 xml-xalan/c/src/XSLT/ElemWhen.cpp
Index: ElemWhen.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWhen.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemWhen.cpp 24 Sep 2002 05:59:38 -0000 1.15
+++ ElemWhen.cpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,10 +71,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemWhen::ElemWhen(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -130,3 +134,7 @@
executeChildren(executionContext);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XSLT/ElemWhen.hpp
Index: ElemWhen.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWhen.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemWhen.hpp 16 Apr 2002 05:45:50 -0000 1.7
+++ ElemWhen.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -89,7 +93,7 @@
ElemWhen (
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -114,6 +118,10 @@
const XPath* m_pTest;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +10 -2 xml-xalan/c/src/XSLT/ElemWithParam.cpp
Index: ElemWithParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWithParam.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemWithParam.cpp 3 Nov 2002 03:41:05 -0000 1.13
+++ ElemWithParam.cpp 25 Nov 2002 18:11:52 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,10 +72,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElemWithParam::ElemWithParam(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber) :
ElemTemplateElement(constructionContext,
@@ -141,3 +145,7 @@
{
return Constants::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -2 xml-xalan/c/src/XSLT/ElemWithParam.hpp
Index: ElemWithParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWithParam.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemWithParam.hpp 3 Nov 2002 03:41:05 -0000 1.10
+++ ElemWithParam.hpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -89,7 +93,7 @@
ElemWithParam(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -136,6 +140,10 @@
const XalanQName* m_qname;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +7 -75 xml-xalan/c/src/XSLT/ExtensionFunctionHandler.cpp
Index: ExtensionFunctionHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionFunctionHandler.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtensionFunctionHandler.cpp 6 May 2002 05:31:57 -0000 1.9
+++ ExtensionFunctionHandler.cpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar ExtensionFunctionHandler::s_tokenDelimiterCharacters[] =
{
XalanUnicode::charSpace,
@@ -165,11 +169,6 @@
{
assert(0); // @@ TODO: Not implemented
- if (!m_componentStarted)
- {
- startupComponent();
- }
-
return XObjectPtr();
}
@@ -178,75 +177,8 @@
void
ExtensionFunctionHandler::startupComponent()
{
- // special case the javaclass engine - the scriptSrcURL is
- // the class name to run. If it starts with class: then use the
- // class object with that name instead of init'ing it as the
- // target of the calls later
- if (equals(m_scriptLang, "javaclass"))
- {
- try
- {
- XalanDOMString cname(m_scriptSrcURL);
-
- bool isClass = false;
-
- if (startsWith(m_scriptSrcURL, "class:"))
- {
- substring(m_scriptSrcURL, cname, 6);
-
- isClass = true;
- }
-
- // @@ JMD: Can't do this in C++
- /*
- Class cl = Class.forName (cname);
- if (isClass)
- {
- m_javaObject = cl;
- }
- else
- {
- m_javaObject = cl.newInstance ();
- }
- */
- m_componentStarted = true;
- return;
- }
- //catch (Exception e)
- catch (...)
- {
- assert(0);
- // System.out.println("Extension error: "+e.getMessage ());
- // throw new XPathProcessorException (e.getMessage (), e);
- }
- }
-
- // if scriptSrcURL is specified read it off
- if (!isEmpty(m_scriptSrcURL))
- {
- assert(0);
- // throw new XPathProcessorException ("src attr not supported (yet)");
- }
+}
- if (isEmpty(m_scriptSrc))
- {
- return;
- }
- // evaluate the src to load whatever content is in that string to
- // the engines
- assert(0);
- // System.out.println("Error! Extensions not implemented!");
- /*
- try
- {
- mgr.exec (m_scriptLang, "XSLTScript", -1, -1, scriptSrc);
- }
- catch (BSFException bsfe)
- {
- throw new XPathProcessorException (bsfe.getMessage (), bsfe);
- }
- */
- m_componentStarted = true;
-}
+XALAN_CPP_NAMESPACE_END
1.10 +10 -2 xml-xalan/c/src/XSLT/ExtensionFunctionHandler.hpp
Index: ExtensionFunctionHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionFunctionHandler.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtensionFunctionHandler.hpp 21 Nov 2000 21:10:04 -0000 1.9
+++ ExtensionFunctionHandler.hpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObjectPtr;
@@ -165,7 +169,7 @@
isFunctionAvailable(const XalanDOMString& function) const;
/// Vector of pointers to function arguments
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<void*> ArgVectorType;
typedef set<XalanDOMString, less<XalanDOMString> > StringSetType;
#else
@@ -223,6 +227,10 @@
static const XalanDOMChar s_tokenDelimiterCharacters[];
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -135 xml-xalan/c/src/XSLT/ExtensionNSHandler.cpp
Index: ExtensionNSHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionNSHandler.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtensionNSHandler.cpp 9 Jul 2002 06:19:40 -0000 1.11
+++ ExtensionNSHandler.cpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XSLTProcessor;
@@ -122,20 +126,6 @@
-/**
- * Construct a new extension namespace handler given all the information
- * needed.
- *
- * @param xslp handle to the XSL processor that I'm working for
- * @param namespaceUri the extension namespace URI that I'm implementing
- * @param elemNames string containing list of elements of extension NS
- * @param funcNames string containing list of functions of extension NS
- * @param lang language of code implementing the extension
- * @param srcURL value of src attribute (if any) - treated as a URL
- * or a classname depending on the value of lang. If
- * srcURL is not null, then scriptSrc is ignored.
- * @param scriptSrc the actual script code (if any)
- */
ExtensionNSHandler::ExtensionNSHandler (
const XalanDOMString& namespaceUri,
const XalanDOMString& elemNames,
@@ -204,52 +194,14 @@
void
ExtensionNSHandler::processElement(
- StylesheetExecutionContext& executionContext,
- const XalanDOMString& localPart,
+ StylesheetExecutionContext& /* executionContext */,
+ const XalanDOMString& /* localPart */,
const XalanElement* /* element */,
Stylesheet& /* stylesheetTree */,
const XalanNode* /* sourceTree */,
const XalanNode* /* sourceNode */,
const XalanQName& /* mode */)
{
- XObjectPtr result;
-
- if (!m_componentStarted)
- {
- try
- {
- startupComponent();
-
- ArgVectorType argv;
-
-// XSLProcessorContext xpc(processor,
-// stylesheetTree, sourceTree, sourceNode, mode);
- /*
- java:
- Vector argv = new Vector (2);
- argv.addElement (xpc);
- argv.addElement (element);
- */
- // $$$ ToDo: There's no way this will ever work...
-// argv.push_back(static_cast<void *>(&xpc));
-// argv.push_back(static_cast<void *>(&element));
- result = ExtensionFunctionHandler::callFunction (localPart, argv);
- }
- // catch (XPathProcessorException e)
- catch (...)
- {
- /*
- e.printStackTrace ();
- throw new XSLProcessorException (e.getMessage (), e);
- */
- //@@ TODO: Error reporting, or throw
- }
- }
-
- if (result.null() == false)
- {
- executionContext.outputToResultTree(*result, 0);
- }
}
@@ -257,20 +209,6 @@
void
ExtensionNSHandler::startupComponent()
{
- if (!m_componentDescLoaded)
- {
- try
- {
- loadComponentDescription();
- }
- catch (...)
- // catch (Exception e)
- {
- // throw new XPathProcessorException (e.getMessage (), e);
- //@@ TODO: Error reporting, or throw
- }
- }
-
ExtensionFunctionHandler::startupComponent();
}
@@ -279,58 +217,7 @@
void
ExtensionNSHandler::loadComponentDescription()
{
- // First try treaing the URI of the extension as a fully qualified
- // class name; if it works then go with treating this an extension
- // implemented in "javaclass" for with that class being the srcURL.
- // forget about setting elements and functions in that case - so if
- // u do extension-{element,function}-available then u get false,
- // but that's ok.
assert(0); // Don't try this in C++
- // @@ How to do this in C++ ??
-/*
- try {
- String cname = namespaceUri.startsWith ("class:") ?
- namespaceUri.substring (6) : namespaceUri;
- Class.forName (cname); // does it load?
- setScript ("javaclass", namespaceUri, null);
- m_componentDescLoaded = true;
- return;
- } catch (Exception e) {
- // oops, it failed .. ok, so this path ain't gonna pan out. shucks.
- }
-
- // parse the document at the URI of the extension, if any
- URL url = m_XSLProcessor.getURLFromString(namespaceUri,
- m_XSLProcessor.m_stylesheetRoot.m_baseIdent);
-
- m_XSLProcessor.m_parserLiaison.parse(new InputSource(url.toString()));
- Document compSpec = m_XSLProcessor.m_parserLiaison.getDocument();
- Element componentElement = compSpec.getDocumentElement ();
-
- // determine the functions and elements of this component
- setElements (componentElement.getAttribute ("elements"));
- setFunctions (componentElement.getAttribute ("functions"));
-
- // is there an lxslt:script element child? [NOTE THAT THIS IS NOT
- // PROPER NAMESPACE-WISE .. I'll FIX IT LATER. .. Sanjiva 8/20/99.]
- NodeList nl = componentElement.getElementsByTagName ("lxslt:script");
- switch (nl.getLength ())
- {
- case 0:
- break;
- case 1:
- Element scriptElem = (Element) nl.item (0);
- String lang = scriptElem.getAttribute ("lang");
- Attr srcURLAttr = scriptElem.getAttributeNode ("src");
- String srcURL = (srcURLAttr == null) ? null : srcURLAttr.getValue ();
- String src = getScriptString (scriptElem);
- setScript (lang, srcURL, src);
- break;
- default:
- throw new XSLProcessorException ("too many <script>s in component");
- }
- m_componentDescLoaded = true;
-*/
}
@@ -338,21 +225,9 @@
XalanDOMString
ExtensionNSHandler::getScriptString(const XalanElement& elem)
{
- XalanDOMString strBuf;
+ return XalanDOMString();
+}
- for (const XalanNode* n = elem.getFirstChild (); n != 0; n = n->getNextSibling())
- {
- switch (n->getNodeType())
- {
- case XalanNode::TEXT_NODE:
- case XalanNode::CDATA_SECTION_NODE:
- strBuf += n->getNodeValue();
- break;
- default:
- break;
- }
- }
- return strBuf;
-}
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XSLT/ExtensionNSHandler.hpp
Index: ExtensionNSHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionNSHandler.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExtensionNSHandler.hpp 13 Aug 2001 17:08:53 -0000 1.8
+++ ExtensionNSHandler.hpp 25 Nov 2002 18:11:52 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class Stylesheet;
class StylesheetExecutionContext;
class XalanElement;
@@ -202,7 +206,7 @@
private:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef set<XalanDOMString,
less<XalanDOMString> > ExtensionSetType;
#else
@@ -240,6 +244,10 @@
static XalanDOMString
getScriptString(const XalanElement& elem);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +10 -2 xml-xalan/c/src/XSLT/FunctionCurrent.cpp
Index: FunctionCurrent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionCurrent.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionCurrent.cpp 20 Sep 2001 18:05:14 -0000 1.12
+++ FunctionCurrent.cpp 25 Nov 2002 18:11:52 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionCurrent::FunctionCurrent()
{
}
@@ -74,7 +78,7 @@
FunctionCurrent::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(executionContext.getCurrentNode() != 0);
@@ -112,3 +116,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The current() function does not accept any arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XSLT/FunctionCurrent.hpp
Index: FunctionCurrent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionCurrent.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionCurrent.hpp 14 Sep 2001 20:49:43 -0000 1.8
+++ FunctionCurrent.hpp 25 Nov 2002 18:11:52 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObject;
class XPathExecutionContext;
@@ -95,7 +99,7 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -116,6 +120,10 @@
bool
operator==(const FunctionCurrent&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.32 +16 -8 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- FunctionDocument.cpp 6 Aug 2002 00:07:13 -0000 1.31
+++ FunctionDocument.cpp 25 Nov 2002 18:11:52 -0000 1.32
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionDocument::FunctionDocument()
{
}
@@ -97,7 +101,7 @@
const XalanDOMString& uri,
const XalanDOMString& base,
const XalanNode* sourceNode,
- const Locator* locator)
+ const LocatorType* locator)
{
XalanDOMString theMessage(TranscodeFromLocalCodePage("Cannot load requested document: "));
@@ -121,7 +125,7 @@
const XalanDOMString& uri,
const XalanDOMString& base,
const XalanNode* sourceNode,
- const Locator* locator)
+ const LocatorType* locator)
{
try
{
@@ -144,7 +148,7 @@
const XalanDOMString& base,
BorrowReturnMutableNodeRefList& mnl,
const XalanNode* sourceNode,
- const Locator* locator)
+ const LocatorType* locator)
{
XalanDocument* newDoc = executionContext.getSourceDocument(uri);
@@ -182,7 +186,7 @@
const XalanDOMString& uri,
BorrowReturnMutableNodeRefList& mnl,
const XalanNode* sourceNode,
- const Locator* locator)
+ const LocatorType* locator)
{
getDoc(executionContext, uri, XalanDOMString(), mnl, sourceNode, locator);
}
@@ -195,7 +199,7 @@
const XalanDOMString& uri,
const XalanNode* resolver,
BorrowReturnMutableNodeRefList& mnl,
- const Locator* locator)
+ const LocatorType* locator)
{
assert(resolver != 0);
@@ -223,7 +227,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false);
@@ -251,7 +255,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -318,7 +322,7 @@
const XObjectPtr arg,
XalanDOMString* base,
int argCount,
- const Locator* locator) const
+ const LocatorType* locator) const
{
typedef XPathExecutionContext::BorrowReturnMutableNodeRefList BorrowReturnMutableNodeRefList;
@@ -442,3 +446,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The document() function accepts one or two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +11 -3 xml-xalan/c/src/XSLT/FunctionDocument.hpp
Index: FunctionDocument.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionDocument.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionDocument.hpp 14 May 2002 15:46:50 -0000 1.8
+++ FunctionDocument.hpp 25 Nov 2002 18:11:52 -0000 1.9
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Implementation of the XSLT function document().
//
class XALAN_XSLT_EXPORT FunctionDocument : public Function
@@ -86,7 +90,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
@@ -94,7 +98,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -117,7 +121,7 @@
const XObjectPtr arg,
XalanDOMString* base,
int argCount,
- const Locator* locator) const;
+ const LocatorType* locator) const;
// Not implemented...
FunctionDocument&
@@ -126,6 +130,10 @@
bool
operator==(const FunctionDocument&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +10 -2 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FunctionElementAvailable.cpp 6 May 2002 05:31:57 -0000 1.16
+++ FunctionElementAvailable.cpp 25 Nov 2002 18:11:52 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionElementAvailable::FunctionElementAvailable()
{
}
@@ -83,7 +87,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -142,3 +146,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The function-available() function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2 xml-xalan/c/src/XSLT/FunctionElementAvailable.hpp
Index: FunctionElementAvailable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionElementAvailable.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionElementAvailable.hpp 14 Sep 2001 20:49:43 -0000 1.5
+++ FunctionElementAvailable.hpp 25 Nov 2002 18:11:52 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObject;
class XPathExecutionContext;
@@ -96,7 +100,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -118,6 +122,10 @@
bool
operator==(const FunctionElementAvailable&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.18 +19 -11 xml-xalan/c/src/XSLT/FunctionFormatNumber.cpp
Index: FunctionFormatNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFormatNumber.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FunctionFormatNumber.cpp 12 Aug 2002 04:00:39 -0000 1.17
+++ FunctionFormatNumber.cpp 25 Nov 2002 18:11:52 -0000 1.18
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionFormatNumber::FunctionFormatNumber()
{
}
@@ -96,7 +100,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -135,7 +139,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false && arg2.null() == false && arg3.null() == false);
@@ -187,7 +191,7 @@
const XalanDOMString& thePattern,
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
- const Locator* locator,
+ const LocatorType* locator,
bool fWarn) const
{
if (DoubleSupport::isNaN(theNumber) == true)
@@ -272,15 +276,15 @@
-static XalanDOMString s_warningNotImplementedString;
-static XalanDOMString s_warningNotFoundString;
+static XalanDOMString s_staticWarningNotImplementedString;
+static XalanDOMString s_staticWarningNotFoundString;
const XalanDOMString& FunctionFormatNumber::s_warningNotImplementedString =
- ::s_warningNotImplementedString;
+ s_staticWarningNotImplementedString;
const XalanDOMString& FunctionFormatNumber::s_warningNotFoundString =
- ::s_warningNotFoundString;
+ s_staticWarningNotFoundString;
const XalanDOMString FunctionFormatNumber::s_emptyString;
@@ -288,9 +292,9 @@
void
FunctionFormatNumber::initialize()
{
- ::s_warningNotImplementedString = XALAN_STATIC_UCODE_STRING("format-number() is not fully implemented!");
+ s_staticWarningNotImplementedString = XALAN_STATIC_UCODE_STRING("format-number() is not fully implemented!");
- ::s_warningNotFoundString = XALAN_STATIC_UCODE_STRING("format-number: Specified decimal-format element not found!");
+ s_staticWarningNotFoundString = XALAN_STATIC_UCODE_STRING("format-number: Specified decimal-format element not found!");
}
@@ -298,7 +302,11 @@
void
FunctionFormatNumber::terminate()
{
- releaseMemory(::s_warningNotImplementedString);
+ releaseMemory(s_staticWarningNotImplementedString);
- releaseMemory(::s_warningNotFoundString);
+ releaseMemory(s_staticWarningNotFoundString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +12 -4 xml-xalan/c/src/XSLT/FunctionFormatNumber.hpp
Index: FunctionFormatNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFormatNumber.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionFormatNumber.hpp 12 Aug 2002 04:00:39 -0000 1.11
+++ FunctionFormatNumber.hpp 25 Nov 2002 18:11:52 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,6 +80,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanDecimalFormatSymbols;
class XObject;
class XPathExecutionContext;
@@ -117,7 +121,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
@@ -126,7 +130,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -145,7 +149,7 @@
const XalanDOMString& thePattern,
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
- const Locator* locator,
+ const LocatorType* locator,
bool fWarn = true) const;
private:
@@ -169,6 +173,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +10 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FunctionFunctionAvailable.cpp 6 May 2002 05:31:57 -0000 1.15
+++ FunctionFunctionAvailable.cpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString FunctionFunctionAvailable::s_emptyString;
@@ -87,7 +91,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg.null() == false);
@@ -144,3 +148,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The function-available() function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2 xml-xalan/c/src/XSLT/FunctionFunctionAvailable.hpp
Index: FunctionFunctionAvailable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFunctionAvailable.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionFunctionAvailable.hpp 14 Sep 2001 20:49:43 -0000 1.6
+++ FunctionFunctionAvailable.hpp 25 Nov 2002 18:11:52 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObject;
class XPathExecutionContext;
@@ -96,7 +100,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -121,6 +125,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.23 +13 -7 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FunctionGenerateID.cpp 6 May 2002 05:31:57 -0000 1.22
+++ FunctionGenerateID.cpp 25 Nov 2002 18:11:52 -0000 1.23
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,14 +71,16 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString FunctionGenerateID::s_emptyString;
FunctionGenerateID::FunctionGenerateID() :
- Function(),
- m_prefix(XALAN_STATIC_UCODE_STRING("N")),
- m_prefixLength(length(m_prefix))
+ Function()
{
}
@@ -116,7 +118,7 @@
FunctionGenerateID::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -131,7 +133,7 @@
{
XPathExecutionContext::GetAndReleaseCachedString theID(executionContext);
- theID.get() = m_prefix;
+ theID.get() = XalanUnicode::charLetter_N;
getSuffix(context, theID.get());
@@ -146,7 +148,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false);
@@ -181,3 +183,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The generate-id function takes zero or one arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +11 -7 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionGenerateID.hpp 26 Sep 2001 21:30:23 -0000 1.10
+++ FunctionGenerateID.hpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Implementation of the XSLT function generate-id().
//
class XALAN_XSLT_EXPORT FunctionGenerateID : public Function
@@ -87,14 +91,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -116,12 +120,12 @@
bool
operator==(const FunctionGenerateID&) const;
- const XalanDOMString m_prefix;
-
- const XalanDOMString::size_type m_prefixLength;
-
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.24 +7 -6 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FunctionKey.cpp 21 Sep 2002 01:24:41 -0000 1.23
+++ FunctionKey.cpp 25 Nov 2002 18:11:52 -0000 1.24
@@ -83,10 +83,7 @@
-#if !defined(XALAN_NO_NAMESPACES)
- using std::set;
-#endif
-
+XALAN_CPP_NAMESPACE_BEGIN
@@ -108,7 +105,7 @@
XalanDocument* document,
const XalanDOMString& keyname,
const XalanDOMString& ref,
- const Locator* locator,
+ const LocatorType* locator,
MutableNodeRefList& theNodeRefList)
{
assert(document != 0);
@@ -142,7 +139,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -255,3 +252,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The key() function takes two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -2 xml-xalan/c/src/XSLT/FunctionKey.hpp
Index: FunctionKey.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionKey.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionKey.hpp 14 Sep 2001 20:49:43 -0000 1.9
+++ FunctionKey.hpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObject;
class XPathExecutionContext;
@@ -96,7 +100,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -119,6 +123,10 @@
bool
operator==(const FunctionKey&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.25 +10 -2 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- FunctionSystemProperty.cpp 6 May 2002 05:31:57 -0000 1.24
+++ FunctionSystemProperty.cpp 25 Nov 2002 18:11:52 -0000 1.25
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 200-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionSystemProperty::FunctionSystemProperty() :
Function(),
m_xsltNamespaceURI(XALAN_STATIC_UCODE_STRING("http://www.w3.org/1999/XSL/Transform")),
@@ -97,7 +101,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false);
@@ -209,3 +213,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The system-property() function accepts one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XSLT/FunctionSystemProperty.hpp
Index: FunctionSystemProperty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionSystemProperty.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionSystemProperty.hpp 6 May 2002 05:31:57 -0000 1.8
+++ FunctionSystemProperty.hpp 25 Nov 2002 18:11:52 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Implementation of the XSLT function sytsem-property().
//
class XALAN_XSLT_EXPORT FunctionSystemProperty : public Function
@@ -86,7 +90,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -118,6 +122,10 @@
const XalanDOMString m_vendorString;
const XalanDOMString m_vendorURLString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +10 -2 xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.cpp
Index: FunctionUnparsedEntityURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FunctionUnparsedEntityURI.cpp 20 Sep 2001 18:05:14 -0000 1.16
+++ FunctionUnparsedEntityURI.cpp 25 Nov 2002 18:11:52 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionUnparsedEntityURI::FunctionUnparsedEntityURI()
{
}
@@ -83,7 +87,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg.null() == false);
@@ -123,3 +127,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The unparsed-entity-uri function accepts one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -2 xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.hpp
Index: FunctionUnparsedEntityURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionUnparsedEntityURI.hpp 14 Sep 2001 20:49:43 -0000 1.7
+++ FunctionUnparsedEntityURI.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,8 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
// Implementation of the XSLT function UnparsedEntityURI.
@@ -93,7 +95,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -119,6 +121,11 @@
bool
operator==(const FunctionUnparsedEntityURI&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // FUNCTIONUNPARSEDENTITYURI_HEADER_GUARD_1357924680
1.6 +13 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenerateEvent.cpp 26 Sep 2001 21:30:23 -0000 1.5
+++ GenerateEvent.cpp 25 Nov 2002 18:11:52 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
GenerateEvent::GenerateEvent(EventType eventType) :
m_eventType(eventType),
m_characters(),
@@ -74,7 +78,7 @@
GenerateEvent::GenerateEvent(
EventType eventType,
const XalanDOMChar* name,
- AttributeList* atts) :
+ AttributeListType* atts) :
m_eventType(eventType),
m_characters(),
m_start(0),
@@ -88,9 +92,9 @@
GenerateEvent::GenerateEvent(
- EventType eventType,
- const XalanDOMString& name,
- const AttributeList* atts) :
+ EventType eventType,
+ const XalanDOMString& name,
+ const AttributeListType* atts) :
m_eventType(eventType),
m_characters(),
m_start(0),
@@ -147,3 +151,7 @@
m_pAtts(0)
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +19 -7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GenerateEvent.hpp 26 Sep 2001 21:30:23 -0000 1.6
+++ GenerateEvent.hpp 25 Nov 2002 18:11:52 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,7 +68,15 @@
-class AttributeList;
+XALAN_DECLARE_XERCES_CLASS(AttributeList)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
@@ -156,7 +164,7 @@
GenerateEvent(
EventType eventType,
const XalanDOMChar* name,
- AttributeList* atts);
+ AttributeListType* atts);
/**
* Constructor for startElement, endElement events.
@@ -166,9 +174,9 @@
* @param atts SAX attribute list
*/
GenerateEvent(
- EventType eventType,
- const XalanDOMString& name,
- const AttributeList* atts = 0);
+ EventType eventType,
+ const XalanDOMString& name,
+ const AttributeListType* atts = 0);
/**
* Constructor for characters, cdate events.
@@ -241,8 +249,12 @@
/**
* The current attribute list.
*/
- const AttributeList* m_pAtts;
+ const AttributeListType* m_pAtts;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +9 -1 xml-xalan/c/src/XSLT/KeyDeclaration.hpp
Index: KeyDeclaration.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyDeclaration.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- KeyDeclaration.hpp 3 Nov 2002 03:36:56 -0000 1.9
+++ KeyDeclaration.hpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -152,6 +156,10 @@
const XPath* m_use;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +8 -0 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- KeyTable.cpp 3 Nov 2002 03:36:56 -0000 1.21
+++ KeyTable.cpp 25 Nov 2002 18:11:52 -0000 1.22
@@ -84,6 +84,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const MutableNodeRefList KeyTable::s_dummyList;
@@ -337,3 +341,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -2 xml-xalan/c/src/XSLT/KeyTable.hpp
Index: KeyTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyTable.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- KeyTable.hpp 26 Sep 2002 01:37:47 -0000 1.14
+++ KeyTable.hpp 25 Nov 2002 18:11:52 -0000 1.15
@@ -85,6 +85,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class KeyDeclaration;
class NodeRefListBase;
class PrefixResolver;
@@ -106,7 +110,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<KeyDeclaration> KeyDeclarationVectorType;
typedef map<XalanDOMString,
@@ -194,6 +198,10 @@
static const MutableNodeRefList s_dummyList;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +10 -22 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- NamespacesHandler.cpp 14 Nov 2002 17:54:58 -0000 1.29
+++ NamespacesHandler.cpp 25 Nov 2002 18:11:52 -0000 1.30
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class VectorType, class MemberFunctionType>
const typename VectorType::value_type*
find(
@@ -452,7 +456,7 @@
if(equalsIgnoreCaseASCII(thePrefix, Constants::ATTRVAL_DEFAULT_PREFIX) == true)
{
- ::clear(thePrefix);
+ thePrefix.clear();
}
const XalanDOMString* const theNamespaceURI =
@@ -498,7 +502,7 @@
if(equalsIgnoreCaseASCII(thePrefix, Constants::ATTRVAL_DEFAULT_PREFIX) == true)
{
- ::clear(thePrefix);
+ thePrefix.clear();
}
const XalanDOMString* const theNamespace =
@@ -653,26 +657,6 @@
}
-#if 0
-bool
-NamespacesHandler::shouldExcludeResultNamespaceNode(
- const XalanDOMString& theXSLTNamespaceURI,
- const NamespacesHandler& stylesheetNamespacesHandler,
- const NameSpace& theNamespace) const
-{
- const XalanDOMString& theURI = theNamespace.getURI();
-
- if(shouldExcludeResultNamespaceNode(theXSLTNamespaceURI, theURI) == true)
- {
- return true;
- }
- else
- {
- return stylesheetNamespacesHandler.isExcludedNamespaceURI(theURI);
- }
-}
-#endif
-
bool
NamespacesHandler::isExcludedNamespaceURI(const XalanDOMString& theNamespaceURI) const
@@ -957,3 +941,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +10 -17 xml-xalan/c/src/XSLT/NamespacesHandler.hpp
Index: NamespacesHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NamespacesHandler.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NamespacesHandler.hpp 13 Nov 2002 02:29:44 -0000 1.16
+++ NamespacesHandler.hpp 25 Nov 2002 18:11:52 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class StylesheetConstructionContext;
class StylesheetExecutionContext;
@@ -232,7 +236,7 @@
typedef XalanQName::NamespaceVectorType NamespaceVectorType;
typedef XalanQName::NamespacesStackType NamespacesStackType;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<Namespace> NamespacesVectorType;
typedef vector<NamespaceExtended> NamespaceExtendedVectorType;
@@ -486,21 +490,6 @@
copyExcludeResultPrefixes(const NamespacesVectorType& theExcludeResultPrefixes);
/**
- * Determine if a given namespace should be excluded. For use during
- * stylesheet construction only.
- *
- * @param theXSLTNamespaceURI The namespace URI for XSLT.
- * @param parentNamespacesHandler The parent handler instance.
- * @param theNamespace The namespace.
- * @return true of the namespace should be excluded, false if not.
- */
- bool
- shouldExcludeResultNamespaceNode(
- const XalanDOMString& theXSLTNamespaceURI,
- const NamespacesHandler& parentNamespacesHandler,
- const NameSpace& theNamespace) const;
-
- /**
* Determine if a given namespace should be excluded as a result of
* an exclude-result-prefixes declaration.
*
@@ -548,6 +537,10 @@
NamespaceAliasesMapType m_namespaceAliases;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +8 -0 xml-xalan/c/src/XSLT/NodeSortKey.cpp
Index: NodeSortKey.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSortKey.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NodeSortKey.cpp 29 May 2002 18:21:52 -0000 1.7
+++ NodeSortKey.cpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -140,3 +144,7 @@
return *this;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +9 -4 xml-xalan/c/src/XSLT/NodeSortKey.hpp
Index: NodeSortKey.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSortKey.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NodeSortKey.hpp 29 May 2002 18:21:52 -0000 1.10
+++ NodeSortKey.hpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ExecutionContext;
class PrefixResolver;
class XPath;
@@ -201,8 +205,9 @@
};
-#endif
-/*
- * $ Log: $
- */
+XALAN_CPP_NAMESPACE_END
+
+
+
+#endif
1.26 +10 -6 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NodeSorter.cpp 24 Jul 2002 23:19:43 -0000 1.25
+++ NodeSorter.cpp 25 Nov 2002 18:11:52 -0000 1.26
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
NodeSorter::NodeSorter() :
m_numberResultsCache(),
m_stringResultsCache(),
@@ -112,9 +116,7 @@
m_scratchVector,
m_keys);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::stable_sort;
-#endif
+ XALAN_USING_STD(stable_sort)
// Use the stl sort algorithm, which will use our compare functor,
// which returns true if first less than second
@@ -338,9 +340,7 @@
{
theCache[theKeyIndex].resize(m_nodes.size());
-#if !defined(XALAN_NO_NAMESPACES)
- using std::fill;
-#endif
+ XALAN_USING_STD(fill)
// Fill with the dummy value...
fill(
@@ -406,3 +406,7 @@
return theCache[theKeyIndex][theEntry.m_position];
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +12 -4 xml-xalan/c/src/XSLT/NodeSorter.hpp
Index: NodeSorter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSorter.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NodeSorter.hpp 19 Jul 2001 04:39:23 -0000 1.15
+++ NodeSorter.hpp 25 Nov 2002 18:11:52 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,6 +82,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class MutableNodeRefList;
class StylesheetExecutionContext;
class XalanNode;
@@ -112,7 +116,7 @@
unsigned int m_position;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<VectorEntry> NodeVectorType;
typedef vector<NodeSortKey> NodeSortKeyVectorType;
#else
@@ -146,7 +150,7 @@
/**
* Return the results of a compare of two nodes.
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct XALAN_XSLT_EXPORT NodeSortKeyCompare : public binary_function<const NodeVectorType::value_type&, const NodeVectorType::value_type&, bool>
#else
struct XALAN_XSLT_EXPORT NodeSortKeyCompare : public std::binary_function<const NodeVectorType::value_type&, const NodeVectorType::value_type&, bool>
@@ -229,7 +233,7 @@
friend struct NodeSortKeyCompare;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<double> NumberResultsCacheVectorType;
typedef vector<XObjectPtr> StringResultsCacheVectorType;
@@ -264,6 +268,10 @@
NodeVectorType m_scratchVector;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/OutputContextStack.cpp
Index: OutputContextStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/OutputContextStack.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OutputContextStack.cpp 20 Nov 2000 20:00:07 -0000 1.1
+++ OutputContextStack.cpp 25 Nov 2002 18:11:52 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
OutputContextStack::OutputContextStack() :
m_stack(1),
m_stackPosition(m_stack.begin())
@@ -136,3 +140,7 @@
popContext();
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +10 -2 xml-xalan/c/src/XSLT/OutputContextStack.hpp
Index: OutputContextStack.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/OutputContextStack.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputContextStack.hpp 29 Mar 2001 22:23:02 -0000 1.2
+++ OutputContextStack.hpp 25 Nov 2002 18:11:52 -0000 1.3
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class FormatterListener;
@@ -107,7 +111,7 @@
m_pendingAttributes.clear();
- ::clear(m_pendingElementName);
+ m_pendingElementName.clear();
m_hasPendingStartDocument = false;
@@ -125,7 +129,7 @@
bool m_mustFlushPendingStartDocument;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef deque<OutputContext> OutputContextStackType;
#else
typedef std::deque<OutputContext> OutputContextStackType;
@@ -242,6 +246,10 @@
OutputContextStackType::iterator m_stackPosition;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/ProblemListener.cpp
Index: ProblemListener.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListener.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProblemListener.cpp 18 Dec 1999 19:48:04 -0000 1.1
+++ ProblemListener.cpp 25 Nov 2002 18:11:52 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ProblemListener::ProblemListener()
{
}
@@ -74,3 +78,7 @@
ProblemListener::~ProblemListener()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -2 xml-xalan/c/src/XSLT/ProblemListener.hpp
Index: ProblemListener.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListener.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProblemListener.hpp 3 Nov 2002 03:36:25 -0000 1.6
+++ ProblemListener.hpp 25 Nov 2002 18:11:52 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,9 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
class ElemTemplateElement;
class XalanNode;
@@ -139,6 +142,10 @@
int charOffset) = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +8 -0 xml-xalan/c/src/XSLT/ProblemListenerDefault.cpp
Index: ProblemListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListenerDefault.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ProblemListenerDefault.cpp 3 Nov 2002 03:36:25 -0000 1.10
+++ ProblemListenerDefault.cpp 25 Nov 2002 18:11:52 -0000 1.11
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const char* const errorHeader = "error: ";
static const char* const warningHeader = "warning: ";
static const char* const messageHeader = "message: ";
@@ -208,3 +212,7 @@
pw.println();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1 xml-xalan/c/src/XSLT/ProblemListenerDefault.hpp
Index: ProblemListenerDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListenerDefault.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProblemListenerDefault.hpp 3 Nov 2002 03:36:25 -0000 1.7
+++ ProblemListenerDefault.hpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* The implementation of the default error handling for Xalan.
*/
@@ -82,7 +86,7 @@
~ProblemListenerDefault();
// These methods are inherited from ProblemListener ...
-
+
virtual void
setPrintWriter(PrintWriter* pw);
@@ -121,6 +125,10 @@
PrintWriter* m_pw;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +9 -1 xml-xalan/c/src/XSLT/ResultNamespacesStack.cpp
Index: ResultNamespacesStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultNamespacesStack.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResultNamespacesStack.cpp 11 Oct 2002 02:02:27 -0000 1.9
+++ ResultNamespacesStack.cpp 25 Nov 2002 18:11:52 -0000 1.10
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ResultNamespacesStack::ResultNamespacesStack() :
m_resultNamespaces(1),
m_stackBegin(m_resultNamespaces.begin()),
@@ -209,7 +213,7 @@
const XalanDOMString& thisPrefix = ns.getPrefix();
- if(::equals(thePrefix, thisPrefix))
+ if(thePrefix == thisPrefix)
{
fResult = true;
}
@@ -238,3 +242,7 @@
m_createNewContextStack.clear();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 xml-xalan/c/src/XSLT/ResultNamespacesStack.hpp
Index: ResultNamespacesStack.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultNamespacesStack.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResultNamespacesStack.hpp 11 Oct 2002 02:02:27 -0000 1.8
+++ ResultNamespacesStack.hpp 25 Nov 2002 18:11:52 -0000 1.9
@@ -76,11 +76,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT ResultNamespacesStack
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<bool> BoolVectorType;
#else
typedef std::vector<bool> BoolVectorType;
@@ -183,6 +187,10 @@
BoolVectorType m_createNewContextStack;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +13 -0 xml-xalan/c/src/XSLT/ResultTreeFrag.cpp
Index: ResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultTreeFrag.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResultTreeFrag.cpp 26 Sep 2002 06:00:41 -0000 1.7
+++ ResultTreeFrag.cpp 25 Nov 2002 18:11:52 -0000 1.8
@@ -59,7 +59,12 @@
+#include <cassert>
+
+
+
#include <XalanDOM/XalanDOMException.hpp>
+#include <XalanDOM/XalanDOMString.hpp>
@@ -67,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString ResultTreeFrag::s_emptyString;
@@ -561,3 +570,7 @@
return theLength;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XSLT/ResultTreeFrag.hpp
Index: ResultTreeFrag.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultTreeFrag.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultTreeFrag.hpp 26 Sep 2002 01:38:15 -0000 1.4
+++ ResultTreeFrag.hpp 25 Nov 2002 18:11:52 -0000 1.5
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeDocumentFragment;
@@ -251,6 +255,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/ResultTreeFragAllocator.cpp
Index: ResultTreeFragAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultTreeFragAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResultTreeFragAllocator.cpp 1 Nov 2001 15:55:15 -0000 1.1
+++ ResultTreeFragAllocator.cpp 25 Nov 2002 18:11:52 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ResultTreeFragAllocator::ResultTreeFragAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -117,3 +121,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XSLT/ResultTreeFragAllocator.hpp
Index: ResultTreeFragAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultTreeFragAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResultTreeFragAllocator.hpp 16 Apr 2002 05:15:42 -0000 1.2
+++ ResultTreeFragAllocator.hpp 25 Nov 2002 18:11:52 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT ResultTreeFragAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +12 -0 xml-xalan/c/src/XSLT/ResultTreeFragBaseNodeRefListBaseProxy.cpp
Index: ResultTreeFragBaseNodeRefListBaseProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultTreeFragBaseNodeRefListBaseProxy.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResultTreeFragBaseNodeRefListBaseProxy.cpp 5 Aug 2002 18:32:53 -0000 1.2
+++ ResultTreeFragBaseNodeRefListBaseProxy.cpp 25 Nov 2002 18:11:52 -0000 1.3
@@ -60,10 +60,18 @@
+#include <cassert>
+
+
+
#include <XPath/ResultTreeFragBase.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ResultTreeFragBaseNodeRefListBaseProxy::ResultTreeFragBaseNodeRefListBaseProxy(const ResultTreeFragBase& value) :
NodeRefListBase(),
m_value(value)
@@ -117,3 +125,7 @@
{
return theNode == &m_value ? 1 : 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/ResultTreeFragBaseNodeRefListBaseProxy.hpp
Index: ResultTreeFragBaseNodeRefListBaseProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ResultTreeFragBaseNodeRefListBaseProxy.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResultTreeFragBaseNodeRefListBaseProxy.hpp 5 Aug 2002 05:52:07 -0000 1.2
+++ ResultTreeFragBaseNodeRefListBaseProxy.hpp 25 Nov 2002 18:11:52 -0000 1.3
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ResultTreeFragBase;
@@ -111,6 +115,10 @@
// Data members...
const ResultTreeFragBase& m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1 xml-xalan/c/src/XSLT/SelectionEvent.cpp
Index: SelectionEvent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/SelectionEvent.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SelectionEvent.cpp 6 Nov 2002 05:09:48 -0000 1.7
+++ SelectionEvent.cpp 25 Nov 2002 18:11:53 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
SelectionEvent::SelectionEvent(
StylesheetExecutionContext& executionContext,
const XalanNode* sourceNode,
@@ -101,3 +105,7 @@
SelectionEvent::~SelectionEvent()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -1 xml-xalan/c/src/XSLT/SelectionEvent.hpp
Index: SelectionEvent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/SelectionEvent.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SelectionEvent.hpp 6 Nov 2002 05:09:48 -0000 1.8
+++ SelectionEvent.hpp 25 Nov 2002 18:11:53 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,11 @@
#include <XPath/XObject.hpp>
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
class ElemTemplateElement;
class StylesheetExecutionContext;
@@ -160,6 +165,10 @@
SelectionEvent&
operator=(const SelectionEvent& other);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.87 +20 -14 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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Stylesheet.cpp 6 Nov 2002 05:09:48 -0000 1.86
+++ Stylesheet.cpp 25 Nov 2002 18:11:53 -0000 1.87
@@ -108,6 +108,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString Stylesheet::s_emptyString;
const XalanQNameByReference Stylesheet::s_emptyQName;
@@ -174,7 +178,7 @@
m_baseIdent = urlString;
}
}
- catch(const XMLPlatformUtilsException&)
+ catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtilsException&)
{
// Assume that any exception here relates to get the urlString from
// m_baseIdent. We'll assume that it's just a fake base identifier
@@ -189,7 +193,7 @@
Stylesheet::~Stylesheet()
{
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::for_each;
#endif
@@ -214,7 +218,7 @@
ElemTemplateElement*
Stylesheet::initWrapperless(
StylesheetConstructionContext& constructionContext,
- const Locator* locator)
+ const LocatorType* locator)
{
if (m_isWrapperless == true)
{
@@ -254,8 +258,8 @@
void
Stylesheet::processKeyElement(
const PrefixResolver& nsContext,
- const AttributeList& atts,
- const Locator* locator,
+ const AttributeListType& atts,
+ const LocatorType* locator,
StylesheetConstructionContext& constructionContext)
{
const XalanDOMChar* nameAttr = 0;
@@ -339,7 +343,7 @@
void
-Stylesheet::pushNamespaces(const AttributeList& atts)
+Stylesheet::pushNamespaces(const AttributeListType& atts)
{
const unsigned int nAttrs = atts.getLength();
@@ -531,7 +535,7 @@
bool
Stylesheet::isAttrOK(
const XalanDOMChar* attrName,
- const AttributeList& /* atts */,
+ const AttributeListType& /* atts */,
int /* which */,
StylesheetConstructionContext& constructionContext) const
{
@@ -550,7 +554,7 @@
const XalanDOMString prefix(attrName, indexOfNSSep);
const XalanDOMString* ns = getNamespaceForPrefixFromStack(prefix);
- attrOK = ns != 0 && !::isEmpty(*ns) && !equals(*ns, constructionContext.getXSLTNamespaceURI());
+ attrOK = ns != 0 && !ns->empty() && *ns != constructionContext.getXSLTNamespaceURI();
}
else if (m_XSLTVerDeclared > constructionContext.getXSLTVersionSupported())
{
@@ -833,9 +837,7 @@
const MatchPattern2* thePattern,
PatternTableVectorType& theVector)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const PatternTableVectorType::const_iterator theResult =
find(
@@ -1351,7 +1353,7 @@
void
Stylesheet::processNSAliasElement(
const XalanDOMChar* /* name */,
- const AttributeList& atts,
+ const AttributeListType& atts,
StylesheetConstructionContext& constructionContext)
{
const unsigned int nAttrs = atts.getLength();
@@ -1418,8 +1420,8 @@
void
Stylesheet::processDecimalFormatElement(
StylesheetConstructionContext& constructionContext,
- const AttributeList& atts,
- const Locator* locator)
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
const int lineNumber = locator != 0 ? locator->getLineNumber() : -1;
const int columnNumber = locator != 0 ? locator->getColumnNumber() : -1;
@@ -1958,3 +1960,7 @@
{
return m_baseIdent;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.56 +21 -16 xml-xalan/c/src/XSLT/Stylesheet.hpp
Index: Stylesheet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.hpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Stylesheet.hpp 14 Nov 2002 17:24:58 -0000 1.55
+++ Stylesheet.hpp 25 Nov 2002 18:11:53 -0000 1.56
@@ -89,13 +89,16 @@
-#include "NamespacesHandler.hpp"
-#include "KeyDeclaration.hpp"
-#include "StylesheetExecutionContext.hpp"
+#include <XSLT/NamespacesHandler.hpp>
+#include <XSLT/KeyDeclaration.hpp>
+#include <XSLT/StylesheetExecutionContext.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class AttributeList;
class ExtensionNSHandler;
class XalanDecimalFormatSymbols;
class ElemAttributeSet;
@@ -104,13 +107,11 @@
class ElemTemplateElement;
class ElemVariable;
class KeyTable;
-class Locator;
class NodeRefListBase;
class PrefixResolver;
class StylesheetConstructionContext;
class StylesheetRoot;
class XalanQName;
-class XMLURL;
class XObject;
class StylesheetExecutionContext;
@@ -135,7 +136,7 @@
typedef XalanQName::NamespaceVectorType NamespaceVectorType;
typedef XalanQName::NamespacesStackType NamespacesStackType;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<XalanDOMString,
ExtensionNSHandler*,
less<XalanDOMString> > ExtensionNamespacesMapType;
@@ -296,7 +297,7 @@
* @param atts attribute list constaining namespaces
*/
void
- pushNamespaces(const AttributeList& atts);
+ pushNamespaces(const AttributeListType& atts);
/**
* Pop a namespace declaration from the namespace stack.
@@ -327,7 +328,7 @@
bool
isAttrOK(
const XalanDOMChar* attrName,
- const AttributeList& atts,
+ const AttributeListType& atts,
int which,
StylesheetConstructionContext& constructionContext) const;
@@ -480,7 +481,7 @@
void
processNSAliasElement(
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
StylesheetConstructionContext& constructionContext);
/**
@@ -491,8 +492,8 @@
void
processDecimalFormatElement(
StylesheetConstructionContext& constructionContext,
- const AttributeList& atts,
- const Locator* locator = 0);
+ const AttributeListType& atts,
+ const LocatorType* locator = 0);
/**
* Retrieve the XalanDecimalFormatSymbols instance associated with
@@ -558,7 +559,7 @@
ElemTemplateElement*
initWrapperless(
StylesheetConstructionContext& constructionContext,
- const Locator* locator);
+ const LocatorType* locator);
/**
* Retrieve the stack of who's including who
@@ -582,8 +583,8 @@
void
processKeyElement(
const PrefixResolver& nsContext,
- const AttributeList& atts,
- const Locator* locator,
+ const AttributeListType& atts,
+ const LocatorType* locator,
StylesheetConstructionContext& constructionContext);
/**
@@ -752,7 +753,7 @@
eMatchScore m_priority;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<const MatchPattern2*> PatternTableListType;
typedef vector<const MatchPattern2*> PatternTableVectorType;
@@ -1229,6 +1230,10 @@
static const XalanEmptyNamedNodeMap s_fakeAttributes;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XSLT/StylesheetConstructionContext.cpp
Index: StylesheetConstructionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContext.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StylesheetConstructionContext.cpp 31 Oct 2002 07:15:56 -0000 1.3
+++ StylesheetConstructionContext.cpp 25 Nov 2002 18:11:53 -0000 1.4
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
StylesheetConstructionContext::StylesheetConstructionContext() :
XPathConstructionContext()
{
@@ -69,3 +73,7 @@
StylesheetConstructionContext::~StylesheetConstructionContext()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +57 -43 xml-xalan/c/src/XSLT/StylesheetConstructionContext.hpp
Index: StylesheetConstructionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContext.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StylesheetConstructionContext.hpp 14 Nov 2002 17:24:58 -0000 1.21
+++ StylesheetConstructionContext.hpp 25 Nov 2002 18:11:53 -0000 1.22
@@ -79,20 +79,30 @@
-class AttributeList;
+XALAN_DECLARE_XERCES_CLASS(AttributeList)
+XALAN_DECLARE_XERCES_CLASS(DocumentHandler)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler DocumentHandlerType;
+
+
+
class AVT;
class AVTPart;
-class DocumentHandler;
class ElemTemplateElement;
class ExtensionNSHandler;
-class Locator;
class PrefixResolver;
class Stylesheet;
class StylesheetRoot;
class XalanDocument;
class XalanNode;
class XPath;
-class XMLURL;
class XSLTInputSource;
@@ -300,7 +310,7 @@
*/
virtual XPath*
createMatchPattern(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMString& str,
const PrefixResolver& resolver) = 0;
@@ -316,7 +326,7 @@
*/
virtual XPath*
createMatchPattern(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver) = 0;
@@ -332,7 +342,7 @@
*/
virtual XPath*
createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMString& str,
const PrefixResolver& resolver) = 0;
@@ -348,7 +358,7 @@
*/
virtual XPath*
createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver) = 0;
@@ -364,7 +374,7 @@
*/
virtual XPath*
createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver) = 0;
@@ -374,7 +384,7 @@
*
* @return A pointer to the Locator, or 0 if there is nothing on the stack.
*/
- virtual const Locator*
+ virtual const LocatorType*
getLocatorFromStack() const = 0;
/**
@@ -383,7 +393,7 @@
* @param A pointer to the Locator to push.
*/
virtual void
- pushLocatorOnStack(const Locator* locator) = 0;
+ pushLocatorOnStack(const LocatorType* locator) = 0;
/**
* Pop the locator from the top of the locator stack.
@@ -413,7 +423,7 @@
virtual XalanDocument*
parseXML(
const XalanDOMString& urlString,
- DocumentHandler* docHandler,
+ DocumentHandlerType* docHandler,
XalanDocument* docToRegister) = 0;
/**
@@ -429,7 +439,7 @@
isXMLSpaceAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const Locator* theLocator = 0) = 0;
+ const LocatorType* theLocator = 0) = 0;
/**
* Given an name, determine if it is the xsl:use-attribute-sets attribute
@@ -444,7 +454,7 @@
isXSLUseAttributeSetsAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const Locator* theLocator = 0) = 0;
+ const LocatorType* theLocator = 0) = 0;
/**
* Given an name, determine if it is a valid QName
@@ -459,7 +469,7 @@
isValidQName(
const XalanDOMChar* theName,
const Stylesheet& theStylesheet,
- const Locator* theLocator = 0) = 0;
+ const LocatorType* theLocator = 0) = 0;
/**
* Given an XSL tag name, return an integer token that corresponds to
@@ -529,10 +539,10 @@
*/
virtual const AVT*
createAVT(
- const Locator* locator,
- const XalanDOMChar* name,
- const XalanDOMChar* stringedValue,
- const PrefixResolver& resolver) = 0;
+ const LocatorType* locator,
+ const XalanDOMChar* name,
+ const XalanDOMChar* stringedValue,
+ const PrefixResolver& resolver) = 0;
/**
* Create an AVTPart instance.
@@ -558,7 +568,7 @@
*/
virtual const AVTPart*
createAVTPart(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver) = 0;
@@ -596,7 +606,7 @@
createXalanQName(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool fUseDefault = false) = 0;
/**
@@ -612,7 +622,7 @@
createXalanQName(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool fUseDefault = false) = 0;
/**
@@ -631,7 +641,7 @@
size_type& count,
const XalanDOMChar* qnameTokens,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool fUseDefault = false) = 0;
/**
@@ -649,10 +659,10 @@
*/
virtual ElemTemplateElement*
createElement(
- int token,
- Stylesheet& stylesheetTree,
- const AttributeList& atts,
- const Locator* locator = 0) = 0;
+ int token,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ const LocatorType* locator = 0) = 0;
/**
* Create a literal result element. The instance owns the
@@ -668,10 +678,10 @@
*/
virtual ElemTemplateElement*
createElement(
- Stylesheet& stylesheetTree,
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator = 0) = 0;
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator = 0) = 0;
/**
* Create a an element for literal text. The instance owns the
@@ -694,7 +704,7 @@
XalanDOMString::size_type length,
bool preserveSpace,
bool disableOutputEscaping,
- const Locator* locator = 0) = 0;
+ const LocatorType* locator = 0) = 0;
/**
* Create an element to handle an extension element. The
@@ -712,11 +722,11 @@
*/
virtual ElemTemplateElement*
createElement(
- Stylesheet& stylesheetTree,
- const XalanDOMChar* name,
- const AttributeList& atts,
- ExtensionNSHandler& handler,
- const Locator* locator = 0) = 0;
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ ExtensionNSHandler& handler,
+ const LocatorType* locator = 0) = 0;
// These are inherited from XPathConstructionContext...
@@ -730,7 +740,7 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
error(
@@ -742,7 +752,7 @@
error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
warn(
@@ -754,7 +764,7 @@
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
warn(
@@ -766,7 +776,7 @@
warn(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
message(
@@ -778,7 +788,7 @@
message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
message(
@@ -790,8 +800,12 @@
message(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.31 +48 -44 xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp
Index: StylesheetConstructionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StylesheetConstructionContextDefault.cpp 6 Nov 2002 05:09:48 -0000 1.30
+++ StylesheetConstructionContextDefault.cpp 25 Nov 2002 18:11:53 -0000 1.31
@@ -110,6 +110,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
StylesheetConstructionContextDefault::StylesheetConstructionContextDefault(
XSLTEngineImpl& processor,
XPathFactory& xpathFactory,
@@ -173,7 +177,7 @@
StylesheetConstructionContextDefault::error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (locator != 0)
{
@@ -202,7 +206,7 @@
StylesheetConstructionContextDefault::error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
error(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -224,7 +228,7 @@
StylesheetConstructionContextDefault::warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (locator != 0)
{
@@ -253,7 +257,7 @@
StylesheetConstructionContextDefault::warn(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
warn(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -275,7 +279,7 @@
StylesheetConstructionContextDefault::message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (locator != 0)
{
@@ -304,7 +308,7 @@
StylesheetConstructionContextDefault::message(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
message(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -314,9 +318,7 @@
void
StylesheetConstructionContextDefault::reset()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(
m_stylesheets.begin(),
@@ -420,9 +422,7 @@
void
StylesheetConstructionContextDefault::destroy(StylesheetRoot* theStylesheetRoot)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const StylesheetVectorType::iterator i =
find(
@@ -491,7 +491,7 @@
XPath*
StylesheetConstructionContextDefault::createMatchPattern(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMString& str,
const PrefixResolver& resolver)
{
@@ -520,7 +520,7 @@
XPath*
StylesheetConstructionContextDefault::createMatchPattern(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver)
{
@@ -535,7 +535,7 @@
XPath*
StylesheetConstructionContextDefault::createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMString& str,
const PrefixResolver& resolver)
{
@@ -564,7 +564,7 @@
XPath*
StylesheetConstructionContextDefault::createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver)
{
@@ -579,7 +579,7 @@
XPath*
StylesheetConstructionContextDefault::createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver)
@@ -593,7 +593,7 @@
-const Locator*
+const LocatorType*
StylesheetConstructionContextDefault::getLocatorFromStack() const
{
return m_processor.getLocatorFromStack();
@@ -602,7 +602,7 @@
void
-StylesheetConstructionContextDefault::pushLocatorOnStack(const Locator* locator)
+StylesheetConstructionContextDefault::pushLocatorOnStack(const LocatorType* locator)
{
m_processor.pushLocatorOnStack(locator);
}
@@ -628,7 +628,7 @@
XalanDocument*
StylesheetConstructionContextDefault::parseXML(
const XalanDOMString& urlString,
- DocumentHandler* docHandler,
+ DocumentHandlerType* docHandler,
XalanDocument* docToRegister)
{
return m_processor.parseXML(urlString, docHandler, docToRegister);
@@ -640,7 +640,7 @@
StylesheetConstructionContextDefault::isXMLSpaceAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const Locator* theLocator)
+ const LocatorType* theLocator)
{
assert(theAttributeName != 0);
@@ -655,7 +655,7 @@
StylesheetConstructionContextDefault::isXSLUseAttributeSetsAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const Locator* theLocator)
+ const LocatorType* theLocator)
{
assert(theAttributeName != 0);
@@ -670,7 +670,7 @@
StylesheetConstructionContextDefault::isValidQName(
const XalanDOMChar* theName,
const Stylesheet& theStylesheet,
- const Locator* theLocator)
+ const LocatorType* theLocator)
{
assert(theName != 0);
@@ -682,7 +682,7 @@
inline XMLSSize_t
-getLineNumber(const Locator* theLocator)
+getLineNumber(const LocatorType* theLocator)
{
return theLocator == 0 ? -1 : theLocator->getLineNumber();
}
@@ -690,7 +690,7 @@
inline XMLSSize_t
-getColumnNumber(const Locator* theLocator)
+getColumnNumber(const LocatorType* theLocator)
{
return theLocator == 0 ? -1 : theLocator->getColumnNumber();
}
@@ -699,10 +699,10 @@
ElemTemplateElement*
StylesheetConstructionContextDefault::createElement(
- int token,
- Stylesheet& stylesheetTree,
- const AttributeList& atts,
- const Locator* locator)
+ int token,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
const XMLSSize_t lineNumber = getLineNumber(locator);
const XMLSSize_t columnNumber = getColumnNumber(locator);
@@ -987,10 +987,10 @@
ElemTemplateElement*
StylesheetConstructionContextDefault::createElement(
- Stylesheet& stylesheetTree,
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator)
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
const XMLSSize_t lineNumber = getLineNumber(locator);
const XMLSSize_t columnNumber = getColumnNumber(locator);
@@ -1008,11 +1008,11 @@
ElemTemplateElement*
StylesheetConstructionContextDefault::createElement(
- Stylesheet& stylesheetTree,
- const XalanDOMChar* name,
- const AttributeList& atts,
- ExtensionNSHandler& handler,
- const Locator* locator)
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ ExtensionNSHandler& handler,
+ const LocatorType* locator)
{
const XMLSSize_t lineNumber = getLineNumber(locator);
const XMLSSize_t columnNumber = getColumnNumber(locator);
@@ -1040,7 +1040,7 @@
XalanDOMString::size_type length,
bool preserveSpace,
bool disableOutputEscaping,
- const Locator* locator)
+ const LocatorType* locator)
{
const XMLSSize_t lineNumber = getLineNumber(locator);
const XMLSSize_t columnNumber = getColumnNumber(locator);
@@ -1179,7 +1179,7 @@
const AVT*
StylesheetConstructionContextDefault::createAVT(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver)
@@ -1201,7 +1201,7 @@
const AVTPart*
StylesheetConstructionContextDefault::createAVTPart(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver)
@@ -1240,7 +1240,7 @@
StylesheetConstructionContextDefault::createXalanQName(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool fUseDefault)
{
return m_xalanQNameByValueAllocator.create(qname, namespaces, locator, fUseDefault);
@@ -1253,7 +1253,7 @@
StylesheetConstructionContextDefault::createXalanQName(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool fUseDefault)
{
return m_xalanQNameByValueAllocator.create(qname, namespaces, locator, fUseDefault);
@@ -1267,7 +1267,7 @@
size_type& count,
const XalanDOMChar* qnameTokens,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool fUseDefault)
{
assert(qnameTokens != 0);
@@ -1966,3 +1966,7 @@
const StylesheetConstructionContextDefault::ElementTokenTableEntry& StylesheetConstructionContextDefault::s_elementTokenTableDummy =
StylesheetConstructionContextDefault::s_elementTokenTable[s_elementTokenTableSize - 1];
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +48 -40 xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.hpp
Index: StylesheetConstructionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StylesheetConstructionContextDefault.hpp 6 Nov 2002 05:09:48 -0000 1.29
+++ StylesheetConstructionContextDefault.hpp 25 Nov 2002 18:11:53 -0000 1.30
@@ -120,6 +120,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPathEnvSupport;
class XPathFactory;
class XPathProcessor;
@@ -200,7 +204,7 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
error(
@@ -212,7 +216,7 @@
error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
warn(
@@ -224,7 +228,7 @@
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
warn(
@@ -236,7 +240,7 @@
warn(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
message(
@@ -248,7 +252,7 @@
message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
message(
@@ -260,7 +264,7 @@
message(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
// These interfaces are inherited from StylesheetConstructionContext...
@@ -302,40 +306,40 @@
virtual XPath*
createMatchPattern(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMString& str,
const PrefixResolver& resolver);
virtual XPath*
createMatchPattern(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver);
virtual XPath*
createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMString& str,
const PrefixResolver& resolver);
virtual XPath*
createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver);
virtual XPath*
createXPath(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver);
- virtual const Locator*
+ virtual const LocatorType*
getLocatorFromStack() const;
virtual void
- pushLocatorOnStack(const Locator* locator);
+ pushLocatorOnStack(const LocatorType* locator);
virtual void
popLocatorStack();
@@ -346,26 +350,26 @@
virtual XalanDocument*
parseXML(
const XalanDOMString& urlString,
- DocumentHandler* docHandler,
+ DocumentHandlerType* docHandler,
XalanDocument* docToRegister);
virtual bool
isXMLSpaceAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const Locator* theLocator = 0);
+ const LocatorType* theLocator = 0);
virtual bool
isXSLUseAttributeSetsAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const Locator* theLocator = 0);
+ const LocatorType* theLocator = 0);
virtual bool
isValidQName(
const XalanDOMChar* theName,
const Stylesheet& theStylesheet,
- const Locator* theLocator = 0);
+ const LocatorType* theLocator = 0);
virtual eElementToken
getElementToken(const XalanDOMString& name) const;
@@ -398,10 +402,10 @@
virtual const AVT*
createAVT(
- const Locator* locator,
- const XalanDOMChar* name,
- const XalanDOMChar* stringedValue,
- const PrefixResolver& resolver);
+ const LocatorType* locator,
+ const XalanDOMChar* name,
+ const XalanDOMChar* stringedValue,
+ const PrefixResolver& resolver);
virtual const AVTPart*
createAVTPart(
@@ -410,7 +414,7 @@
virtual const AVTPart*
createAVTPart(
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver);
@@ -425,14 +429,14 @@
createXalanQName(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool fUseDefault = false);
virtual const XalanQName*
createXalanQName(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool fUseDefault = false);
virtual const XalanQName**
@@ -440,22 +444,22 @@
size_type& count,
const XalanDOMChar* qnameTokens,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool fUseDefault = false);
virtual ElemTemplateElement*
createElement(
- int token,
- Stylesheet& stylesheetTree,
- const AttributeList& atts,
- const Locator* locator = 0);
+ int token,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ const LocatorType* locator = 0);
virtual ElemTemplateElement*
createElement(
- Stylesheet& stylesheetTree,
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator = 0);
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator = 0);
virtual ElemTemplateElement*
createElement(
@@ -464,20 +468,20 @@
XalanDOMString::size_type length,
bool preserveSpace,
bool disableOutputEscaping,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
virtual ElemTemplateElement*
createElement(
- Stylesheet& stylesheetTree,
- const XalanDOMChar* name,
- const AttributeList& atts,
- ExtensionNSHandler& handler,
- const Locator* locator = 0);
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ ExtensionNSHandler& handler,
+ const LocatorType* locator = 0);
static eElementToken
getElementNameToken(const XalanDOMString& name);
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<StylesheetRoot*> StylesheetVectorType;
typedef vector<ElemTemplateElement*> ElemTemplateElementVectorType;
#else
@@ -707,6 +711,10 @@
static const ElementTokenTableEntry& s_elementTokenTableDummy;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +9 -1 xml-xalan/c/src/XSLT/StylesheetExecutionContext.cpp
Index: StylesheetExecutionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StylesheetExecutionContext.cpp 3 Apr 2002 05:13:38 -0000 1.11
+++ StylesheetExecutionContext.cpp 25 Nov 2002 18:11:53 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
StylesheetExecutionContext::StylesheetExecutionContext(XObjectFactory* theXObjectFactory) :
XPathExecutionContext(theXObjectFactory)
{
@@ -145,3 +149,7 @@
m_formatter->clearEncoding();
m_formatter->setWriter(&writer);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.81 +26 -16 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.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- StylesheetExecutionContext.hpp 14 Nov 2002 23:57:41 -0000 1.80
+++ StylesheetExecutionContext.hpp 25 Nov 2002 18:11:53 -0000 1.81
@@ -104,6 +104,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class CountersTable;
class ElemTemplate;
class ElemTemplateElement;
@@ -145,6 +149,12 @@
{
public:
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef ostream StreamType;
+#else
+ typedef std::ostream StreamType;
+#endif
+
typedef size_t size_type;
explicit
@@ -691,7 +701,7 @@
const XPath* m_xpath;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<TopLevelArg> ParamVectorType;
#else
typedef std::vector<TopLevelArg> ParamVectorType;
@@ -1768,15 +1778,11 @@
/**
* Create a PrintWriter using the provided ostream instance.
*
- * @param ostream The output stream for the PrintWriter.
+ * @param theStream The output stream for the PrintWriter.
* @return The new instance.
*/
virtual PrintWriter*
-#if defined(XALAN_NO_NAMESPACES)
- createPrintWriter(ostream& theStream) = 0;
-#else
- createPrintWriter(std::ostream& theStream) = 0;
-#endif
+ createPrintWriter(StreamType& theStream) = 0;
/**
* Get the counters table, which is a table of cached
@@ -1868,7 +1874,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const Locator* locator) = 0;
+ const LocatorType* locator) = 0;
virtual XalanDocument*
parseXML(
@@ -1902,13 +1908,13 @@
XalanDocument* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
- const Locator* locator,
+ const LocatorType* locator,
MutableNodeRefList& nodelist) = 0;
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const Locator* locator = 0) = 0;
+ const LocatorType* locator = 0) = 0;
virtual const PrefixResolver*
getPrefixResolver() const = 0;
@@ -1954,38 +1960,42 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
warn(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
message(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.105 +22 -24 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.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- StylesheetExecutionContextDefault.cpp 3 Nov 2002 03:41:05 -0000 1.104
+++ StylesheetExecutionContextDefault.cpp 25 Nov 2002 18:11:53 -0000 1.105
@@ -117,6 +117,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
StylesheetExecutionContextDefault::XalanNumberFormatFactory StylesheetExecutionContextDefault::s_defaultXalanNumberFormatFactory;
StylesheetExecutionContextDefault::XalanNumberFormatFactory* StylesheetExecutionContextDefault::s_xalanNumberFormatFactory =
@@ -1132,9 +1136,7 @@
bool
StylesheetExecutionContextDefault::findOnElementRecursionStack(const ElemTemplateElement* theElement) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const ElementRecursionStackType::const_iterator i =
find(m_elementRecursionStack.begin(),
@@ -1575,7 +1577,7 @@
const XalanDOMChar* theRHS,
eCaseOrder /* theCaseOrder */) const
{
- return ::collationCompare(theLHS, theRHS);
+ return XALAN_CPP_NAMESPACE_QUALIFIER collationCompare(theLHS, theRHS);
}
@@ -1790,7 +1792,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const Locator* locator)
+ const LocatorType* locator)
{
return m_xpathExecutionContextDefault.extFunction(theNamespace, functionName, context, argVec, locator);
}
@@ -1873,7 +1875,7 @@
XalanDocument* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
- const Locator* locator,
+ const LocatorType* locator,
MutableNodeRefList& nodelist)
{
assert(m_stylesheetRoot != 0);
@@ -1899,7 +1901,7 @@
const XObjectPtr
StylesheetExecutionContextDefault::getVariable(
const XalanQName& name,
- const Locator* locator)
+ const LocatorType* locator)
{
bool fFound;
@@ -2069,11 +2071,7 @@
PrintWriter*
-#if defined(XALAN_NO_NAMESPACES)
-StylesheetExecutionContextDefault::createPrintWriter(ostream& theStream)
-#else
-StylesheetExecutionContextDefault::createPrintWriter(std::ostream& theStream)
-#endif
+StylesheetExecutionContextDefault::createPrintWriter(StreamType& theStream)
{
XalanOutputStream* const theOutputStream =
new XalanStdOutputStream(theStream);
@@ -2181,7 +2179,7 @@
StylesheetExecutionContextDefault::error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(m_xsltProcessor != 0);
@@ -2217,7 +2215,7 @@
StylesheetExecutionContextDefault::error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
error(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -2246,7 +2244,7 @@
StylesheetExecutionContextDefault::warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(m_xsltProcessor != 0);
@@ -2282,7 +2280,7 @@
StylesheetExecutionContextDefault::warn(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
warn(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -2311,7 +2309,7 @@
StylesheetExecutionContextDefault::message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(m_xsltProcessor != 0);
@@ -2347,7 +2345,7 @@
StylesheetExecutionContextDefault::message(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
message(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -2493,9 +2491,7 @@
void
StylesheetExecutionContextDefault::clearXPathCache()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
assert(m_matchPatternCache.empty() == true || m_xsltProcessor != 0);
@@ -2575,9 +2571,7 @@
void
StylesheetExecutionContextDefault::cleanUpTransients()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(m_formatterListeners.begin(),
m_formatterListeners.end(),
@@ -2611,3 +2605,7 @@
assert(m_matchPatternCache.empty() == true);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.85 +19 -15 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.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- StylesheetExecutionContextDefault.hpp 3 Nov 2002 03:41:06 -0000 1.84
+++ StylesheetExecutionContextDefault.hpp 25 Nov 2002 18:11:53 -0000 1.85
@@ -106,6 +106,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeDocument;
class XPathProcessor;
class XSLTEngineImpl;
@@ -125,7 +129,7 @@
typedef clock_t ClockType;
#endif
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef deque<const ElemTemplateElement*> ElementRecursionStackType;
typedef vector<FormatterListener*> FormatterListenerVectorType;
typedef vector<PrintWriter*> PrintWriterVectorType;
@@ -824,11 +828,7 @@
const XalanDOMString& theEncoding);
virtual PrintWriter*
-#if defined(XALAN_NO_NAMESPACES)
- createPrintWriter(ostream& theStream);
-#else
- createPrintWriter(std::ostream& theStream);
-#endif
+ createPrintWriter(StreamType& theStream);
virtual CountersTable&
getCountersTable();
@@ -893,7 +893,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const Locator* locator);
+ const LocatorType* locator);
virtual XalanDocument*
parseXML(
@@ -927,13 +927,13 @@
XalanDocument* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
- const Locator* locator,
+ const LocatorType* locator,
MutableNodeRefList& nodelist);
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
virtual const PrefixResolver*
getPrefixResolver() const;
@@ -976,37 +976,37 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
warn(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual void
message(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const;
+ const LocatorType* locator) const;
class XPathCacheReturnFunctor
@@ -1190,6 +1190,10 @@
static const DefaultCollationCompareFunctor s_defaultCollationFunctor;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.98 +68 -82 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.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- StylesheetHandler.cpp 12 Nov 2002 02:32:29 -0000 1.97
+++ StylesheetHandler.cpp 25 Nov 2002 18:11:53 -0000 1.98
@@ -100,6 +100,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
typedef StylesheetConstructionContext::GetAndReleaseCachedString GetAndReleaseCachedString;
@@ -139,7 +143,7 @@
-void StylesheetHandler::setDocumentLocator(const Locator* const locator)
+void StylesheetHandler::setDocumentLocator(const LocatorType* const locator)
{
m_constructionContext.pushLocatorOnStack(locator);
@@ -172,9 +176,9 @@
bool
StylesheetHandler::isAttrOK(
- const XalanDOMChar* attrName,
- const AttributeList& atts,
- int which)
+ const XalanDOMChar* attrName,
+ const AttributeListType& atts,
+ int which)
{
return m_stylesheet.isAttrOK(attrName, atts, which, m_constructionContext);
}
@@ -183,11 +187,11 @@
bool
StylesheetHandler::processSpaceAttr(
- const XalanDOMChar* aname,
- const AttributeList& atts,
- int which,
- const Locator* locator,
- bool& fPreserve)
+ const XalanDOMChar* aname,
+ const AttributeListType& atts,
+ int which,
+ const LocatorType* locator,
+ bool& fPreserve)
{
if(m_constructionContext.isXMLSpaceAttribute(aname, m_stylesheet, locator) == false)
{
@@ -219,7 +223,7 @@
inline int
-getLineNumber(const Locator* theLocator)
+getLineNumber(const LocatorType* theLocator)
{
return theLocator == 0 ? -1 : theLocator->getLineNumber();
}
@@ -227,7 +231,7 @@
inline int
-getColumnNumber(const Locator* theLocator)
+getColumnNumber(const LocatorType* theLocator)
{
return theLocator == 0 ? -1 : theLocator->getColumnNumber();
}
@@ -236,9 +240,9 @@
bool
StylesheetHandler::processSpaceAttr(
- const AttributeList& atts,
- const Locator* locator,
- bool& fPreserve)
+ const AttributeListType& atts,
+ const LocatorType* locator,
+ bool& fPreserve)
{
const unsigned int len = atts.getLength();
@@ -258,7 +262,7 @@
void
StylesheetHandler::startElement(
const XMLCh* const name,
- AttributeList& atts)
+ AttributeListType& atts)
{
m_inExtensionElementStack.push_back(false);
@@ -273,24 +277,15 @@
try
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
// By default, space is not preserved...
bool fPreserveSpace = false;
bool fSpaceAttrProcessed = false;
processAccumulatedText();
- // Clean up the whitespace elements.
-// for_each(m_whiteSpaceElems.begin(),
-// m_whiteSpaceElems.end(),
-// DeleteFunctor<ElemTemplateElement>());
-//
m_whiteSpaceElems.clear();
- const Locator* const locator = m_constructionContext.getLocatorFromStack();
+ const LocatorType* const locator = m_constructionContext.getLocatorFromStack();
// First push namespaces
m_stylesheet.pushNamespaces(atts);
@@ -636,9 +631,9 @@
ElemTemplateElement*
StylesheetHandler::initWrapperless(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator)
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
assert(m_pTemplate == 0);
@@ -695,12 +690,12 @@
void
StylesheetHandler::processTopLevelElement(
- const XalanDOMChar* name,
- const AttributeList& atts,
- int xslToken,
- const Locator* locator,
- bool& fPreserveSpace,
- bool& fSpaceAttrProcessed)
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ int xslToken,
+ const LocatorType* locator,
+ bool& fPreserveSpace,
+ bool& fSpaceAttrProcessed)
{
if(m_foundStylesheet && StylesheetConstructionContext::ELEMNAME_IMPORT != xslToken)
{
@@ -837,11 +832,11 @@
void
StylesheetHandler::processStylesheet(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator,
- bool& fPreserveSpace,
- bool& fSpaceAttrProcessed)
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator,
+ bool& fPreserveSpace,
+ bool& fSpaceAttrProcessed)
{
m_foundStylesheet = true;
@@ -921,10 +916,10 @@
void
StylesheetHandler::processExtensionElement(
- const XalanDOMChar* /* name */,
- const XalanDOMString& /* localName */,
- const AttributeList& /* atts */,
- const Locator* /* locator */)
+ const XalanDOMChar* /* name */,
+ const XalanDOMString& /* localName */,
+ const AttributeListType& /* atts */,
+ const LocatorType* /* locator */)
{
}
@@ -933,7 +928,7 @@
void
StylesheetHandler::checkForOrAddVariableName(
const XalanQName& theVariableName,
- const Locator* theLocator)
+ const LocatorType* theLocator)
{
if (m_inTemplate == false)
{
@@ -977,10 +972,10 @@
void
StylesheetHandler::processPreserveStripSpace(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator,
- int xslToken)
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator,
+ int xslToken)
{
const unsigned int nAttrs = atts.getLength();
@@ -1057,7 +1052,7 @@
void
StylesheetHandler::appendChildElementToParent(
ElemTemplateElement* elem,
- const Locator* locator)
+ const LocatorType* locator)
{
appendChildElementToParent(m_elemStack.back(), elem, locator);
}
@@ -1068,7 +1063,7 @@
StylesheetHandler::appendChildElementToParent(
ElemTemplateElement* parent,
ElemTemplateElement* elem,
- const Locator* locator)
+ const LocatorType* locator)
{
assert(parent != 0 && elem != 0);
@@ -1129,9 +1124,9 @@
void
StylesheetHandler::processImport(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator)
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
const unsigned int nAttrs = atts.getLength();
@@ -1218,9 +1213,9 @@
void
StylesheetHandler::processInclude(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator)
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator)
{
const unsigned int nAttrs = atts.getLength();
@@ -1272,17 +1267,8 @@
void
StylesheetHandler::endElement(const XMLCh* const /* name */)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
processAccumulatedText();
- // Clean up the whitespace elements.
-// for_each(m_whiteSpaceElems.begin(),
-// m_whiteSpaceElems.end(),
-// DeleteFunctor<ElemTemplateElement>());
-
m_whiteSpaceElems.clear();
m_stylesheet.popNamespaces();
@@ -1448,7 +1434,7 @@
parent = m_elemStack[m_elemStack.size() - 2];
}
- const Locator* const locator = m_constructionContext.getLocatorFromStack();
+ const LocatorType* const locator = m_constructionContext.getLocatorFromStack();
ElemTemplateElement* const elem =
m_constructionContext.createElement(
@@ -1544,9 +1530,7 @@
bool
StylesheetHandler::inExtensionElement() const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
if (find(
m_inExtensionElementStack.rbegin(),
@@ -1565,8 +1549,8 @@
void
StylesheetHandler::error(
- const char* theMessage,
- const Locator* theLocator) const
+ const char* theMessage,
+ const LocatorType* theLocator) const
{
m_constructionContext.error(theMessage, 0, theLocator);
}
@@ -1576,7 +1560,7 @@
void
StylesheetHandler::error(
const XalanDOMString& theMessage,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
m_constructionContext.error(theMessage, 0, theLocator);
}
@@ -1587,7 +1571,7 @@
StylesheetHandler::error(
const XalanDOMChar* theMessage1,
const XalanDOMChar* theMessage2,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
const GetAndReleaseCachedString theGuard(m_constructionContext);
@@ -1606,7 +1590,7 @@
StylesheetHandler::error(
const XalanDOMChar* theMessage1,
const XalanDOMString& theMessage2,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
error(theMessage1, theMessage2.c_str(), theLocator);
}
@@ -1617,7 +1601,7 @@
StylesheetHandler::error(
const XalanDOMString& theMessage1,
const XalanDOMChar* theMessage2,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
error(theMessage1.c_str(), theMessage2, theLocator);
}
@@ -1629,7 +1613,7 @@
StylesheetHandler::error(
const XalanDOMString& theMessage1,
const XalanDOMString& theMessage2,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
error(theMessage1.c_str(), theMessage2.c_str(), theLocator);
}
@@ -1640,7 +1624,7 @@
StylesheetHandler::warn(
const XalanDOMChar* theMessage1,
const XalanDOMString& theMessage2,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
warn(theMessage1, theMessage2.c_str(), theLocator);
}
@@ -1652,7 +1636,7 @@
StylesheetHandler::warn(
const XalanDOMChar* theMessage1,
const XalanDOMChar* theMessage2,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
const GetAndReleaseCachedString theGuard(m_constructionContext);
@@ -1670,7 +1654,7 @@
StylesheetHandler::illegalAttributeError(
const XalanDOMChar* theElementName,
const XalanDOMChar* theAttributeName,
- const Locator* theLocator) const
+ const LocatorType* theLocator) const
{
const GetAndReleaseCachedString theGuard(m_constructionContext);
@@ -1726,9 +1710,7 @@
StylesheetHandler::PushPopIncludeState::~PushPopIncludeState()
{
// Clean up the element stack vector
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
// Clean up the element stack vector
for_each(m_handler.m_elemStack.begin(),
@@ -1800,3 +1782,7 @@
StylesheetHandler::terminate()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.42 +64 -56 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- StylesheetHandler.hpp 12 Nov 2002 02:32:29 -0000 1.41
+++ StylesheetHandler.hpp 25 Nov 2002 18:11:53 -0000 1.42
@@ -90,6 +90,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemTemplate;
class ElemTemplateElement;
class ElemTextLiteral;
@@ -109,7 +113,7 @@
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<ElemTemplateElement*> ElemTemplateStackType;
typedef vector<ElemTemplateElement*> ElemTextLiteralStackType;
typedef vector<bool> BoolStackType;
@@ -299,7 +303,7 @@
* any SAX document event.
* @see org.xml.sax.Locator
*/
- virtual void setDocumentLocator(const Locator* const locator);
+ virtual void setDocumentLocator(const LocatorType* const locator);
/**
* Receive notification of the beginning of a document.
@@ -323,7 +327,7 @@
*
* @exception SAXException
*/
- virtual void endDocument ();
+ virtual void endDocument();
/**
* Receive notification of the beginning of an element.
@@ -346,7 +350,7 @@
* @see #endElement
* @see org.xml.sax.AttributeList
*/
- virtual void startElement (const XMLCh* const name, AttributeList& attrs);
+ virtual void startElement(const XMLCh* const name, AttributeListType& attrs);
/**
* Receive notification of the end of an element.
@@ -384,9 +388,9 @@
*/
bool
isAttrOK(
- const XalanDOMChar* attrName,
- const AttributeList& atts,
- int which);
+ const XalanDOMChar* attrName,
+ const AttributeListType& atts,
+ int which);
/**
* Tell whether or not this is a xml:space attribute and, if so, process it.
@@ -400,11 +404,11 @@
*/
bool
processSpaceAttr(
- const XalanDOMChar* aname,
- const AttributeList& atts,
- int which,
- const Locator* locator,
- bool& fPreserve);
+ const XalanDOMChar* aname,
+ const AttributeListType& atts,
+ int which,
+ const LocatorType* locator,
+ bool& fPreserve);
/**
* Tell whether or not this is a xml:space attribute and, if so, process it.
@@ -416,27 +420,27 @@
*/
bool
processSpaceAttr(
- const AttributeList& atts,
- const Locator* locator,
- bool& fPreserve);
+ const AttributeListType& atts,
+ const LocatorType* locator,
+ bool& fPreserve);
/**
* Process xsl:import.
*/
void
processImport(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator);
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator);
/**
* Process xsl:include.
*/
void
processInclude(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator);
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator);
void
doCleanup();
@@ -454,55 +458,55 @@
// Utility functions...
void
error(
- const char* theMessage,
- const Locator* theLocator) const;
+ const char* theMessage,
+ const LocatorType* theLocator) const;
void
illegalAttributeError(
const XalanDOMChar* theElementName,
const XalanDOMChar* theAttributeName,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
error(
const XalanDOMChar* theMessage1,
const XalanDOMChar* theMessage2,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
error(
const XalanDOMChar* theMessage1,
const XalanDOMString& theMessage2,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
error(
const XalanDOMString& theMessage1,
const XalanDOMChar* theMessage2,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
error(
const XalanDOMString& theMessage1,
const XalanDOMString& theMessage2,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
warn(
const XalanDOMChar* theMessage1,
const XalanDOMChar* theMessage2,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
warn(
const XalanDOMChar* theMessage1,
const XalanDOMString& theMessage2,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
error(
const XalanDOMString& theMessage,
- const Locator* theLocator) const;
+ const LocatorType* theLocator) const;
void
processText(
@@ -519,32 +523,32 @@
void
processTopLevelElement(
- const XalanDOMChar* name,
- const AttributeList& atts,
- int xslToken,
- const Locator* locator,
- bool& fPreserveSpace,
- bool& fSpaceAttrProcessed);
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ int xslToken,
+ const LocatorType* locator,
+ bool& fPreserveSpace,
+ bool& fSpaceAttrProcessed);
void
processStylesheet(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator,
- bool& fPreserveSpace,
- bool& fSpaceAttrProcessed);
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator,
+ bool& fPreserveSpace,
+ bool& fSpaceAttrProcessed);
void
processPreserveStripSpace(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator,
- int xslToken);
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator,
+ int xslToken);
void
appendChildElementToParent(
ElemTemplateElement* elem,
- const Locator* locator);
+ const LocatorType* locator);
void
appendChildElementToParent(
@@ -555,22 +559,22 @@
appendChildElementToParent(
ElemTemplateElement* parent,
ElemTemplateElement* elem,
- const Locator* locator);
+ const LocatorType* locator);
bool
inExtensionElement() const;
void
processExtensionElement(
- const XalanDOMChar* name,
- const XalanDOMString& localName,
- const AttributeList& atts,
- const Locator* locator);
+ const XalanDOMChar* name,
+ const XalanDOMString& localName,
+ const AttributeListType& atts,
+ const LocatorType* locator);
void
checkForOrAddVariableName(
const XalanQName& theVariableName,
- const Locator* theLocator);
+ const LocatorType* theLocator);
// Data members...
@@ -754,9 +758,9 @@
*/
ElemTemplateElement*
initWrapperless(
- const XalanDOMChar* name,
- const AttributeList& atts,
- const Locator* locator);
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ const LocatorType* locator);
const XalanDOMString*
getNamespaceFromStack(const XalanDOMChar* theName) const;
@@ -807,6 +811,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.70 +12 -8 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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- StylesheetRoot.cpp 14 Nov 2002 20:05:27 -0000 1.69
+++ StylesheetRoot.cpp 25 Nov 2002 18:11:53 -0000 1.70
@@ -113,6 +113,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
StylesheetRoot::StylesheetRoot(
const XalanDOMString& baseIdentifier,
StylesheetConstructionContext& constructionContext) :
@@ -175,9 +179,7 @@
if (m_cdataSectionElems.size() > 0)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::sort;
-#endif
+ XALAN_USING_STD(sort)
sort(
m_cdataSectionElems.begin(),
@@ -466,14 +468,14 @@
void
StylesheetRoot::processOutputSpec(
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
StylesheetConstructionContext& constructionContext)
{
const unsigned int nAttrs = atts.getLength();
bool didSpecifyIndent = false;
- const Locator* const theLocator = constructionContext.getLocatorFromStack();
+ const LocatorType* const theLocator = constructionContext.getLocatorFromStack();
for(unsigned int i = 0; i < nAttrs; i++)
{
@@ -709,9 +711,7 @@
bool
StylesheetRoot::isCDATASectionElementName(const XalanQName& theQName) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
+ XALAN_USING_STD(find_if)
return find_if(
m_cdataSectionElems.begin(),
@@ -859,3 +859,7 @@
return strip;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.25 +10 -2 xml-xalan/c/src/XSLT/StylesheetRoot.hpp
Index: StylesheetRoot.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StylesheetRoot.hpp 6 Nov 2002 05:09:48 -0000 1.24
+++ StylesheetRoot.hpp 25 Nov 2002 18:11:53 -0000 1.25
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class StylesheetConstructionContext;
class XalanText;
class XSLTResultTarget;
@@ -91,7 +95,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<const XalanQName*> XalanQNameVectorType;
typedef vector<const XPath*> XPathVectorType;
#else
@@ -304,7 +308,7 @@
void
processOutputSpec(
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
StylesheetConstructionContext& constructionContext);
/**
@@ -578,6 +582,10 @@
bool
operator==(const StylesheetRoot&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XSLT/TopLevelArg.cpp
Index: TopLevelArg.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TopLevelArg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TopLevelArg.cpp 13 Aug 2001 17:08:53 -0000 1.4
+++ TopLevelArg.cpp 25 Nov 2002 18:11:53 -0000 1.5
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
TopLevelArg::TopLevelArg(
const XalanQName& name,
const XalanDOMString& expr) :
@@ -96,3 +100,7 @@
TopLevelArg::~TopLevelArg()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/XSLT/TopLevelArg.hpp
Index: TopLevelArg.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TopLevelArg.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TopLevelArg.hpp 13 Aug 2001 17:08:53 -0000 1.6
+++ TopLevelArg.hpp 25 Nov 2002 18:11:53 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObjectPtr;
@@ -178,6 +182,10 @@
const XObjectPtr m_xobject;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/TraceListener.cpp
Index: TraceListener.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TraceListener.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TraceListener.cpp 24 May 2000 19:37:18 -0000 1.1
+++ TraceListener.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
TraceListener::TraceListener()
{
}
@@ -68,3 +72,7 @@
TraceListener::~TraceListener()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +13 -1 xml-xalan/c/src/XSLT/TraceListener.hpp
Index: TraceListener.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TraceListener.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraceListener.hpp 24 May 2000 19:38:49 -0000 1.3
+++ TraceListener.hpp 25 Nov 2002 18:11:53 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,10 +60,18 @@
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class TracerEvent;
class SelectionEvent;
class GenerateEvent;
+
+
class XALAN_XSLT_EXPORT TraceListener
{
public:
@@ -147,6 +155,10 @@
};
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +8 -0 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TraceListenerDefault.cpp 6 Nov 2002 05:09:48 -0000 1.14
+++ TraceListenerDefault.cpp 25 Nov 2002 18:11:53 -0000 1.15
@@ -83,6 +83,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
TraceListenerDefault::TraceListenerDefault(
PrintWriter& thePrintWriter,
bool traceTemplates,
@@ -343,3 +347,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/TraceListenerDefault.hpp
Index: TraceListenerDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TraceListenerDefault.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TraceListenerDefault.hpp 24 May 2000 19:37:19 -0000 1.1
+++ TraceListenerDefault.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class DOMSupport;
class PrintWriter;
@@ -157,6 +161,10 @@
bool m_traceSelection;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TracerEvent.cpp 26 Sep 2001 21:30:23 -0000 1.8
+++ TracerEvent.cpp 25 Nov 2002 18:11:53 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
TracerEvent::TracerEvent(
const StylesheetExecutionContext& executionContext,
const ElemTemplateElement& styleNode) :
@@ -168,3 +172,7 @@
return r + XALAN_STATIC_UCODE_STRING("]");
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -1 xml-xalan/c/src/XSLT/TracerEvent.hpp
Index: TracerEvent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TracerEvent.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TracerEvent.hpp 13 Aug 2001 17:08:53 -0000 1.8
+++ TracerEvent.hpp 25 Nov 2002 18:11:53 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
class XalanNodeList;
class XalanQName;
@@ -139,6 +143,11 @@
TracerEvent& operator=(const TracerEvent &);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif //XALAN_TracerEvent_HEADER_GUARD
1.25 +10 -6 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- VariablesStack.cpp 24 Jul 2002 23:19:43 -0000 1.24
+++ VariablesStack.cpp 25 Nov 2002 18:11:53 -0000 1.25
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
VariablesStack::VariablesStack() :
m_stack(),
m_globalStackFrameIndex(-1),
@@ -274,9 +278,7 @@
CommitPushElementFrame thePusher(*this,
targetTemplate);
-#if !defined (XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(theParams.begin(), theParams.end(), PushParamFunctor(*this));
@@ -422,9 +424,7 @@
XalanNode* const doc = executionContext.getRootDocument();
assert(doc != 0);
-#if !defined (XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
// See if the ElemVariable instance is already being evaluated...
if (find(m_guardStack.begin(), m_guardStack.end(), var) != m_guardStack.end())
@@ -775,3 +775,7 @@
VariablesStack::InvalidStackContextException::~InvalidStackContextException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.18 +11 -3 xml-xalan/c/src/XSLT/VariablesStack.hpp
Index: VariablesStack.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/VariablesStack.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- VariablesStack.hpp 11 Apr 2002 05:54:50 -0000 1.17
+++ VariablesStack.hpp 25 Nov 2002 18:11:53 -0000 1.18
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class Arg;
class ElemTemplateElement;
class ElemVariable;
@@ -174,7 +178,7 @@
const ElemVariable* m_variable;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<ParamsVectorEntry> ParamsVectorType;
typedef vector<const ElemVariable*> RecursionGuardStackType;
#else
@@ -501,7 +505,7 @@
const ElemTemplateElement* m_element;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<StackEntry> VariableStackStackType;
#else
typedef std::vector<StackEntry> VariableStackStackType;
@@ -588,6 +592,10 @@
*/
RecursionGuardStackType m_guardStack;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +8 -0 xml-xalan/c/src/XSLT/XResultTreeFrag.cpp
Index: XResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XResultTreeFrag.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XResultTreeFrag.cpp 4 Oct 2002 23:33:59 -0000 1.9
+++ XResultTreeFrag.cpp 25 Nov 2002 18:11:53 -0000 1.10
@@ -84,6 +84,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
inline const XalanDOMString*
getSingleTextChildValue(const ResultTreeFragBase& theRTreeFrag)
{
@@ -354,3 +358,7 @@
delete this;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/XSLT/XResultTreeFrag.hpp
Index: XResultTreeFrag.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XResultTreeFrag.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XResultTreeFrag.hpp 4 Oct 2002 22:29:44 -0000 1.6
+++ XResultTreeFrag.hpp 25 Nov 2002 18:11:53 -0000 1.7
@@ -88,6 +88,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ResultTreeFrag;
@@ -202,6 +206,10 @@
mutable double m_cachedNumberValue;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XResultTreeFragAllocator.cpp
Index: XResultTreeFragAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XResultTreeFragAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XResultTreeFragAllocator.cpp 1 Nov 2001 15:54:44 -0000 1.1
+++ XResultTreeFragAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XResultTreeFragAllocator::XResultTreeFragAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -117,3 +121,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XResultTreeFragAllocator.hpp
Index: XResultTreeFragAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XResultTreeFragAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XResultTreeFragAllocator.hpp 1 Nov 2001 15:54:44 -0000 1.1
+++ XResultTreeFragAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XResultTreeFragAllocator
{
public:
@@ -176,6 +180,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +1 -1 xml-xalan/c/src/XSLT/XSLTDefinitions.hpp
Index: XSLTDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTDefinitions.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTDefinitions.hpp 28 Jan 2000 14:33:41 -0000 1.2
+++ XSLTDefinitions.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.164 +44 -35 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.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- XSLTEngineImpl.cpp 6 Nov 2002 05:09:48 -0000 1.163
+++ XSLTEngineImpl.cpp 25 Nov 2002 18:11:53 -0000 1.164
@@ -153,6 +153,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XSLTEngineImpl::s_emptyString;
@@ -584,7 +588,7 @@
XalanDocument*
XSLTEngineImpl::parseXML(
const XalanDOMString& urlString,
- DocumentHandler* docHandler,
+ DocumentHandlerType* docHandler,
XalanDocument* docToRegister)
{
@@ -593,7 +597,7 @@
if(doc == 0)
{
- EntityResolver* const theResolver =
+ EntityResolverType* const theResolver =
m_parserLiaison.getEntityResolver();
if (theResolver == 0)
@@ -604,7 +608,7 @@
}
else
{
- const XalanAutoPtr<InputSource> resolverInputSource =
+ const XalanAutoPtr<InputSourceType> resolverInputSource =
theResolver->resolveEntity(0, c_wstr(urlString));
if (resolverInputSource.get() != 0)
@@ -632,9 +636,9 @@
XalanDocument*
XSLTEngineImpl::parseXML(
- const InputSource& inputSource,
- DocumentHandler* docHandler,
- XalanDocument* docToRegister)
+ const InputSourceType& inputSource,
+ DocumentHandlerType* docHandler,
+ XalanDocument* docToRegister)
{
if(0 != docHandler)
{
@@ -879,7 +883,7 @@
localXSLURLString);
}
}
- catch(const XMLException&)
+ catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
{
}
@@ -978,9 +982,7 @@
void
XSLTEngineImpl::removeTraceListener(TraceListener* tl)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::remove;
-#endif
+ XALAN_USING_STD(remove)
const TraceListenerVectorType::iterator i =
remove(
@@ -996,9 +998,7 @@
void
XSLTEngineImpl::fireGenerateEvent(const GenerateEvent& ge)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(
m_traceListeners.begin(),
@@ -1011,9 +1011,7 @@
void
XSLTEngineImpl::fireSelectEvent(const SelectionEvent& se)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(
m_traceListeners.begin(),
@@ -1026,9 +1024,7 @@
void
XSLTEngineImpl::fireTraceEvent(const TracerEvent& te)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(
m_traceListeners.begin(),
@@ -1068,7 +1064,7 @@
void
XSLTEngineImpl::message(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode) const
{
problem(msg, ProblemListener::eMESSAGE, locator, sourceNode);
@@ -1090,7 +1086,7 @@
int lineNumber = -1;
int columnNumber = -1;
- const Locator* locator = getLocatorFromStack();
+ const LocatorType* locator = getLocatorFromStack();
if (locator == 0 && styleNode != 0)
{
@@ -1149,7 +1145,7 @@
XSLTEngineImpl::problem(
const XalanDOMString& msg,
ProblemListener::eClassification classification,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode) const
{
const XalanDOMChar* id = locator.getSystemId();
@@ -1189,7 +1185,7 @@
const XalanNode* sourceNode,
const ElemTemplateElement* styleNode) const
{
- const Locator* const locator = styleNode == 0 ? 0 : styleNode->getLocator();
+ const LocatorType* const locator = styleNode == 0 ? 0 : styleNode->getLocator();
if (locator != 0)
{
@@ -1205,9 +1201,9 @@
void
XSLTEngineImpl::warn(
- const XalanDOMString& msg,
- const Locator& locator,
- const XalanNode* sourceNode) const
+ const XalanDOMString& msg,
+ const LocatorType& locator,
+ const XalanNode* sourceNode) const
{
problem(msg, ProblemListener::eWARNING, locator, sourceNode);
}
@@ -1238,9 +1234,9 @@
void
XSLTEngineImpl::error(
- const XalanDOMString& msg,
- const Locator& locator,
- const XalanNode* sourceNode) const
+ const XalanDOMString& msg,
+ const LocatorType& locator,
+ const XalanNode* sourceNode) const
{
problem(msg, ProblemListener::eERROR, locator, sourceNode);
}
@@ -1351,7 +1347,7 @@
void
-XSLTEngineImpl::setDocumentLocator(const Locator* /* locator */)
+XSLTEngineImpl::setDocumentLocator(const LocatorType* /* locator */)
{
// Do nothing for now
}
@@ -1671,7 +1667,7 @@
void
XSLTEngineImpl::startElement(
const XalanDOMChar* name,
- AttributeList& atts)
+ AttributeListType& atts)
{
assert(getFormatterListener() != 0);
assert(name != 0);
@@ -2668,7 +2664,7 @@
inline bool
isPendingAttributePrefix(
- const AttributeList& thePendingAttributes,
+ const AttributeListType& thePendingAttributes,
const XalanDOMString& thePrefix,
XalanDOMString::size_type thePrefixLength)
{
@@ -2816,9 +2812,7 @@
const XalanDOMString& nodeName = attr->getNodeName();
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
+ XALAN_USING_STD(find_if)
if (find_if(
m_attributeNamesVisited.begin(),
@@ -3195,6 +3189,13 @@
+XALAN_CPP_NAMESPACE_END
+
+
+XALAN_USING_XALAN(XalanDOMString)
+
+
+
static XalanDOMString s_XSLNameSpaceURL;
static XalanDOMString s_XalanNamespaceURL;
@@ -3219,6 +3220,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString& XSLTEngineImpl::s_XSLNameSpaceURL = ::s_XSLNameSpaceURL;
const XalanDOMString& XSLTEngineImpl::s_XalanNamespaceURL = ::s_XalanNamespaceURL;
@@ -3380,3 +3385,7 @@
releaseMemory(::s_typeValueString4);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.104 +37 -22 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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- XSLTEngineImpl.hpp 20 Nov 2002 18:39:35 -0000 1.103
+++ XSLTEngineImpl.hpp 25 Nov 2002 18:11:53 -0000 1.104
@@ -118,11 +118,23 @@
+XALAN_DECLARE_XERCES_CLASS(InputSource)
+XALAN_DECLARE_XERCES_CLASS(DocumentHandler)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler DocumentHandlerType;
+
+
+
// Forward declarations...
-class DocumentHandler;
class DOMSupport;
class GenerateEvent;
-class InputSource;
class PrintWriter;
class ResultTreeFragBase;
class StylesheetConstructionContext;
@@ -132,7 +144,6 @@
class XalanSourceTreeDocument;
class XalanText;
class XMLParserLiaison;
-class XMLURL;
class XObject;
class XPathEnvSupport;
class XPathFactory;
@@ -185,17 +196,17 @@
}
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<const void*,
ClockType,
less<const void*> > DurationsTableMapType;
- typedef vector<const Locator*> LocatorStack;
+ typedef vector<const LocatorType*> LocatorStack;
typedef vector<TraceListener*> TraceListenerVectorType;
typedef vector<bool> BoolVectorType;
typedef vector<const XalanDOMString*> XalanDOMStringPointerVectorType;
#else
typedef std::map<const void*, ClockType> DurationsTableMapType;
- typedef std::vector<const Locator*> LocatorStack;
+ typedef std::vector<const LocatorType*> LocatorStack;
typedef std::vector<TraceListener*> TraceListenerVectorType;
typedef std::vector<bool> BoolVectorType;
typedef std::vector<const XalanDOMString*> XalanDOMStringPointerVectorType;
@@ -400,7 +411,7 @@
XalanDocument*
parseXML(
const XalanDOMString& urlString,
- DocumentHandler* docHandler,
+ DocumentHandlerType* docHandler,
XalanDocument* docToRegister);
/**
@@ -416,9 +427,9 @@
*/
XalanDocument*
parseXML(
- const InputSource& inputSource,
- DocumentHandler* docHandler,
- XalanDocument* docToRegister);
+ const InputSourceType& inputSource,
+ DocumentHandlerType* docHandler,
+ XalanDocument* docToRegister);
/**
* Reset the state of the XSL processor by reading in a new XSL stylesheet
@@ -557,7 +568,7 @@
}
void
- setDocumentLocator(const Locator* locator);
+ setDocumentLocator(const LocatorType* locator);
void
startDocument();
@@ -568,7 +579,7 @@
void
startElement(
const XalanDOMChar* name,
- AttributeList& atts);
+ AttributeListType& atts);
void
endElement(const XalanDOMChar* name);
@@ -817,7 +828,7 @@
virtual void
message(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode = 0) const;
virtual void
@@ -842,7 +853,7 @@
virtual void
warn(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode = 0) const;
virtual void
@@ -854,7 +865,7 @@
virtual void
error(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode = 0) const;
public:
@@ -1178,7 +1189,7 @@
*
* @return attribute list
*/
- const AttributeList&
+ const AttributeListType&
getPendingAttributes() const
{
return getPendingAttributesImpl();
@@ -1190,7 +1201,7 @@
* @param pendingAttributes The attribute list
*/
void
- setPendingAttributes(const AttributeList& pendingAttributes)
+ setPendingAttributes(const AttributeListType& pendingAttributes)
{
getPendingAttributesImpl() = pendingAttributes;
}
@@ -1252,7 +1263,7 @@
*
* @return A pointer to the Locator, or 0 if there is nothing on the stack.
*/
- const Locator*
+ const LocatorType*
getLocatorFromStack() const
{
return m_stylesheetLocatorStack.empty() == true ? 0 : m_stylesheetLocatorStack.back();
@@ -1264,7 +1275,7 @@
* @param A pointer to the Locator to push.
*/
void
- pushLocatorOnStack(const Locator* locator)
+ pushLocatorOnStack(const LocatorType* locator)
{
m_stylesheetLocatorStack.push_back(locator);
}
@@ -1311,7 +1322,7 @@
* @param pendingAttributes The attribute list
*/
void
- setPendingAttributesImpl(const AttributeList& pendingAttributes)
+ setPendingAttributesImpl(const AttributeListType& pendingAttributes)
{
getPendingAttributesImpl() = pendingAttributes;
}
@@ -1571,7 +1582,7 @@
problem(
const XalanDOMString& msg,
ProblemListener::eClassification classification,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode) const;
//==========================================================
@@ -1581,7 +1592,7 @@
/**
* This is used whenever a unique namespace is needed.
*/
- unsigned long m_uniqueNSValue;
+ unsigned long m_uniqueNSValue;
ParamVectorType m_topLevelParams;
@@ -1721,6 +1732,10 @@
bool
operator==(const XSLTEngineImpl&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/XSLT/XSLTInit.cpp
Index: XSLTInit.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTInit.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTInit.cpp 5 Sep 2002 07:07:56 -0000 1.6
+++ XSLTInit.cpp 25 Nov 2002 18:11:53 -0000 1.7
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
unsigned long XSLTInit::s_initCounter = 0;
@@ -129,3 +133,7 @@
Constants::terminate();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XSLT/XSLTInit.hpp
Index: XSLTInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTInit.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTInit.hpp 16 Jan 2001 02:38:37 -0000 1.2
+++ XSLTInit.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,6 +85,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XSLTInit
{
public:
@@ -121,6 +125,10 @@
static unsigned long s_initCounter;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +12 -8 xml-xalan/c/src/XSLT/XSLTInputSource.cpp
Index: XSLTInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTInputSource.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XSLTInputSource.cpp 20 May 2002 18:14:28 -0000 1.16
+++ XSLTInputSource.cpp 25 Nov 2002 18:11:53 -0000 1.17
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLTInputSource::XSLTInputSource() :
InputSource(),
m_stream(0),
@@ -212,11 +216,7 @@
-#if defined(XALAN_NO_NAMESPACES)
-XSLTInputSource::XSLTInputSource(istream* stream) :
-#else
-XSLTInputSource::XSLTInputSource(std::istream* stream) :
-#endif
+XSLTInputSource::XSLTInputSource(StreamType* stream) :
InputSource(),
m_stream(stream),
m_node(0)
@@ -225,10 +225,10 @@
-BinInputStream*
+BinInputStreamType*
XSLTInputSource::makeStream() const
{
- BinInputStream* theResult = 0;
+ BinInputStreamType* theResult = 0;
if (m_stream != 0)
{
@@ -240,7 +240,7 @@
if (theSystemId != 0)
{
- XMLURL theURL;
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLURL theURL;
URISupport::getURLFromString(theSystemId, theURL);
@@ -250,3 +250,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +28 -24 xml-xalan/c/src/XSLT/XSLTInputSource.hpp
Index: XSLTInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTInputSource.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XSLTInputSource.hpp 14 Nov 2002 23:57:41 -0000 1.15
+++ XSLTInputSource.hpp 25 Nov 2002 18:11:53 -0000 1.16
@@ -80,16 +80,32 @@
-class BinInputStream;
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream BinInputStreamType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
+
+
class XalanNode;
-class XALAN_XSLT_EXPORT XSLTInputSource : public InputSource
+class XALAN_XSLT_EXPORT XSLTInputSource : public InputSourceType
{
-
public:
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef istream StreamType;
+#else
+ typedef std::istream StreamType;
+#endif
+
explicit
XSLTInputSource();
@@ -174,11 +190,7 @@
*
* @param stream the input stream...
*/
-#if defined(XALAN_NO_NAMESPACES)
- XSLTInputSource(istream* stream);
-#else
- XSLTInputSource(std::istream* stream);
-#endif
+ XSLTInputSource(StreamType* stream);
/**
* Makes the byte stream for this input source.
@@ -190,7 +202,7 @@
*
* @return pointer to byte stream created
*/
- virtual BinInputStream*
+ virtual BinInputStreamType*
makeStream() const;
/**
@@ -215,36 +227,28 @@
return m_node;
}
-#if defined(XALAN_NO_NAMESPACES)
- istream*
-#else
- std::istream*
-#endif
+ StreamType*
getStream() const
{
return m_stream;
}
void
-#if defined(XALAN_NO_NAMESPACES)
- setStream(istream* stream)
-#else
- setStream(std::istream* stream)
-#endif
+ setStream(StreamType* stream)
{
m_stream = stream;
}
private:
-#if defined(XALAN_NO_NAMESPACES)
- istream* m_stream;
-#else
- std::istream* m_stream;
-#endif
+ StreamType* m_stream;
XalanNode* m_node;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XSLTProcessor.cpp
Index: XSLTProcessor.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTProcessor.cpp 18 Dec 1999 19:48:05 -0000 1.1
+++ XSLTProcessor.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLTProcessor::XSLTProcessor()
{
}
@@ -67,3 +71,7 @@
XSLTProcessor::~XSLTProcessor()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.33 +21 -9 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XSLTProcessor.hpp 6 Nov 2002 05:09:48 -0000 1.32
+++ XSLTProcessor.hpp 25 Nov 2002 18:11:53 -0000 1.33
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,14 +72,21 @@
-#include <XalanDOM/XalanDOMString.hpp>
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
class ElemTemplateElement;
class FormatterListener;
class GenerateEvent;
-class Locator;
class NodeRefListBase;
class PrefixResolver;
class PrintWriter;
@@ -90,6 +97,7 @@
class StylesheetRoot;
class TraceListener;
class TracerEvent;
+class XalanDOMString;
class XalanDocument;
class XalanElement;
class XalanNode;
@@ -428,13 +436,13 @@
* Report a message.
*
* @param msg text of message to output
- * @param locator A Locator for error reporting
+ * @param locator A LocatorType for error reporting
* @param sourceNode node in source where message occurred
*/
virtual void
message(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode = 0) const = 0;
/**
@@ -454,13 +462,13 @@
* Report a warning.
*
* @param msg text of message to output
- * @param locator A Locator for error reporting
+ * @param locator A LocatorType for error reporting
* @param sourceNode node in source where error occurred
*/
virtual void
warn(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode = 0) const = 0;
@@ -481,15 +489,19 @@
* Report an error and throw an exception.
*
* @param msg text of message to output
- * @param locator A Locator for error reporting
+ * @param locator A LocatorType for error reporting
* @param sourceNode node in source where error occurred
*/
virtual void
error(
const XalanDOMString& msg,
- const Locator& locator,
+ const LocatorType& locator,
const XalanNode* sourceNode = 0) const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.cpp
Index: XSLTProcessorEnvSupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTProcessorEnvSupport.cpp 11 Apr 2000 15:08:31 -0000 1.1
+++ XSLTProcessorEnvSupport.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLTProcessorEnvSupport::XSLTProcessorEnvSupport() :
XPathEnvSupport()
{
@@ -68,3 +72,7 @@
XSLTProcessorEnvSupport::~XSLTProcessorEnvSupport()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -2 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.hpp
Index: XSLTProcessorEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSLTProcessorEnvSupport.hpp 3 Nov 2002 03:36:25 -0000 1.14
+++ XSLTProcessorEnvSupport.hpp 25 Nov 2002 18:11:53 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ElemTemplateElement;
class XSLTProcessor;
@@ -154,7 +158,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const Locator* locator) const = 0;
+ const LocatorType* locator) const = 0;
virtual bool
problem(
@@ -183,6 +187,10 @@
bool
operator==(const XSLTProcessorEnvSupport&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +12 -8 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp
Index: XSLTProcessorEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XSLTProcessorEnvSupportDefault.cpp 3 Nov 2002 03:36:25 -0000 1.29
+++ XSLTProcessorEnvSupportDefault.cpp 25 Nov 2002 18:11:53 -0000 1.30
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -94,6 +94,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLTProcessorEnvSupportDefault::XSLTProcessorEnvSupportDefault(XSLTProcessor* theProcessor) :
XSLTProcessorEnvSupport(),
m_defaultSupport(),
@@ -155,10 +159,6 @@
void
XSLTProcessorEnvSupportDefault::reset()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
m_defaultSupport.reset();
}
@@ -196,7 +196,7 @@
XSLTInputSource inputSource(c_wstr(urlText));
- EntityResolver* const theResolver =
+ EntityResolverType* const theResolver =
parserLiaison.getEntityResolver();
if (theResolver == 0)
@@ -207,7 +207,7 @@
}
else
{
- const XalanAutoPtr<InputSource> resolverInputSource =
+ const XalanAutoPtr<InputSourceType> resolverInputSource =
theResolver->resolveEntity(0, c_wstr(urlText));
if (resolverInputSource.get() != 0)
@@ -289,7 +289,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const Locator* locator) const
+ const LocatorType* locator) const
{
return m_defaultSupport.extFunction(
executionContext,
@@ -380,3 +380,7 @@
return false;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +10 -2 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp
Index: XSLTProcessorEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XSLTProcessorEnvSupportDefault.hpp 3 Nov 2002 03:36:25 -0000 1.21
+++ XSLTProcessorEnvSupportDefault.hpp 25 Nov 2002 18:11:53 -0000 1.22
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XSLTProcessor;
@@ -199,7 +203,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual bool
problem(
@@ -234,6 +238,10 @@
XSLTProcessor* m_processor;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2 xml-xalan/c/src/XSLT/XSLTProcessorException.cpp
Index: XSLTProcessorException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorException.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTProcessorException.cpp 19 Dec 2001 22:09:16 -0000 1.5
+++ XSLTProcessorException.cpp 25 Nov 2002 18:11:53 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLTProcessorException::XSLTProcessorException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
@@ -76,7 +80,7 @@
XSLTProcessorException::XSLTProcessorException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType) :
XSLException(theLocator, theMessage, theType)
@@ -97,3 +101,7 @@
XSLTProcessorException::~XSLTProcessorException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2 xml-xalan/c/src/XSLT/XSLTProcessorException.hpp
Index: XSLTProcessorException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorException.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTProcessorException.hpp 19 Dec 2001 22:09:16 -0000 1.6
+++ XSLTProcessorException.hpp 25 Nov 2002 18:11:53 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XSLTProcessorException : public XSLException
{
public:
@@ -97,7 +101,7 @@
* @param theType type of exception, default is "XSLTProcessorException"
*/
XSLTProcessorException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
@@ -114,6 +118,10 @@
virtual
~XSLTProcessorException();
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -10 xml-xalan/c/src/XSLT/XSLTResultTarget.cpp
Index: XSLTResultTarget.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTResultTarget.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSLTResultTarget.cpp 14 Nov 2002 23:57:41 -0000 1.11
+++ XSLTResultTarget.cpp 25 Nov 2002 18:11:53 -0000 1.12
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLTResultTarget::XSLTResultTarget() :
m_fileName(),
m_byteStream(0),
@@ -115,11 +119,7 @@
-#if defined(XALAN_NO_NAMESPACES)
-XSLTResultTarget::XSLTResultTarget(ostream* theStream) :
-#else
-XSLTResultTarget::XSLTResultTarget(std::ostream* theStream) :
-#endif
+XSLTResultTarget::XSLTResultTarget(StreamType* theStream) :
m_fileName(),
m_byteStream(theStream),
m_encoding(),
@@ -134,11 +134,7 @@
-#if defined(XALAN_NO_NAMESPACES)
-XSLTResultTarget::XSLTResultTarget(ostream& theStream) :
-#else
-XSLTResultTarget::XSLTResultTarget(std::ostream& theStream) :
-#endif
+XSLTResultTarget::XSLTResultTarget(StreamType& theStream) :
m_fileName(),
m_byteStream(&theStream),
m_encoding(),
@@ -229,3 +225,7 @@
XSLTResultTarget::~XSLTResultTarget()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +20 -26 xml-xalan/c/src/XSLT/XSLTResultTarget.hpp
Index: XSLTResultTarget.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTResultTarget.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XSLTResultTarget.hpp 14 Nov 2002 23:57:41 -0000 1.18
+++ XSLTResultTarget.hpp 25 Nov 2002 18:11:53 -0000 1.19
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class FormatterListener;
class XalanDocument;
class XalanDocumentFragment;
@@ -90,6 +94,12 @@
{
public:
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef ostream StreamType;
+#else
+ typedef std::ostream StreamType;
+#endif
+
explicit
XSLTResultTarget();
@@ -112,22 +122,14 @@
*
* @param byteStream a pointer to a std ostream for the output
*/
-#if defined(XALAN_NO_NAMESPACES)
- XSLTResultTarget(ostream* theStream);
-#else
- XSLTResultTarget(std::ostream* theStream);
-#endif
+ XSLTResultTarget(StreamType* theStream);
/**
* Create a new output target with a stream.
*
* @param byteStream a reference to a std ostream for the output
*/
-#if defined(XALAN_NO_NAMESPACES)
- XSLTResultTarget(ostream& theStream);
-#else
- XSLTResultTarget(std::ostream& theStream);
-#endif
+ XSLTResultTarget(StreamType& theStream);
/**
* Create a new output target with a character stream.
@@ -196,11 +198,7 @@
* document
*/
void
-#if defined(XALAN_NO_NAMESPACES)
- setByteStream(ostream* byteStream)
-#else
- setByteStream(std::ostream* byteStream)
-#endif
+ setByteStream(StreamType* byteStream)
{
m_byteStream = byteStream;
}
@@ -210,11 +208,7 @@
*
* @return pointer to byte stream, or null if none was supplied.
*/
-#if defined(XALAN_NO_NAMESPACES)
- ostream*
-#else
- std::ostream*
-#endif
+ StreamType*
getByteStream() const
{
return m_byteStream;
@@ -394,11 +388,7 @@
XalanDOMString m_fileName;
-#if defined(XALAN_NO_NAMESPACES)
- ostream* m_byteStream;
-#else
- std::ostream* m_byteStream;
-#endif
+ StreamType* m_byteStream;
XalanDOMString m_encoding;
@@ -412,6 +402,10 @@
FormatterListener* m_formatterListener;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanAVTAllocator.cpp
Index: XalanAVTAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanAVTAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAVTAllocator.cpp 31 Oct 2002 07:15:56 -0000 1.1
+++ XalanAVTAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanAVTAllocator::XalanAVTAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -76,7 +80,7 @@
XalanAVTAllocator::data_type*
XalanAVTAllocator::create(
StylesheetConstructionContext& constructionContext,
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver)
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanAVTAllocator.hpp
Index: XalanAVTAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanAVTAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAVTAllocator.hpp 31 Oct 2002 07:15:56 -0000 1.1
+++ XalanAVTAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanAVTAllocator
{
public:
@@ -112,7 +116,7 @@
data_type*
create(
StylesheetConstructionContext& constructionContext,
- const Locator* locator,
+ const LocatorType* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XalanAVTPartSimpleAllocator.cpp
Index: XalanAVTPartSimpleAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanAVTPartSimpleAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAVTPartSimpleAllocator.cpp 31 Oct 2002 07:15:56 -0000 1.1
+++ XalanAVTPartSimpleAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanAVTPartSimpleAllocator::XalanAVTPartSimpleAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -89,3 +93,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XalanAVTPartSimpleAllocator.hpp
Index: XalanAVTPartSimpleAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanAVTPartSimpleAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAVTPartSimpleAllocator.hpp 31 Oct 2002 07:15:56 -0000 1.1
+++ XalanAVTPartSimpleAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanAVTPartSimpleAllocator
{
public:
@@ -165,6 +169,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XalanAVTPartXPathAllocator.cpp
Index: XalanAVTPartXPathAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanAVTPartXPathAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAVTPartXPathAllocator.cpp 31 Oct 2002 07:15:56 -0000 1.1
+++ XalanAVTPartXPathAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanAVTPartXPathAllocator::XalanAVTPartXPathAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -86,3 +90,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XalanAVTPartXPathAllocator.hpp
Index: XalanAVTPartXPathAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanAVTPartXPathAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAVTPartXPathAllocator.hpp 31 Oct 2002 07:15:56 -0000 1.1
+++ XalanAVTPartXPathAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanAVTPartXPathAllocator
{
public:
@@ -160,6 +164,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemApplyTemplatesAllocator.cpp
Index: XalanElemApplyTemplatesAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemApplyTemplatesAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemApplyTemplatesAllocator.cpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemApplyTemplatesAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemApplyTemplatesAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemApplyTemplatesAllocator.hpp
Index: XalanElemApplyTemplatesAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemApplyTemplatesAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemApplyTemplatesAllocator.hpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemApplyTemplatesAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemApplyTemplatesAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemAttributeAllocator.cpp
Index: XalanElemAttributeAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemAttributeAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemAttributeAllocator.cpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemAttributeAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemAttributeAllocator::XalanElemAttributeAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemAttributeAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemAttributeAllocator.hpp
Index: XalanElemAttributeAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemAttributeAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemAttributeAllocator.hpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemAttributeAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemAttributeAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemAttributeSetAllocator.cpp
Index: XalanElemAttributeSetAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemAttributeSetAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemAttributeSetAllocator.cpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemAttributeSetAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemAttributeSetAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemAttributeSetAllocator.hpp
Index: XalanElemAttributeSetAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemAttributeSetAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemAttributeSetAllocator.hpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemAttributeSetAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemAttributeSetAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemCallTemplateAllocator.cpp
Index: XalanElemCallTemplateAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemCallTemplateAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemCallTemplateAllocator.cpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemCallTemplateAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemCallTemplateAllocator::XalanElemCallTemplateAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemCallTemplateAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemCallTemplateAllocator.hpp
Index: XalanElemCallTemplateAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemCallTemplateAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemCallTemplateAllocator.hpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemCallTemplateAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemCallTemplateAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemElementAllocator.cpp
Index: XalanElemElementAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemElementAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemElementAllocator.cpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemElementAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemElementAllocator::XalanElemElementAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemElementAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemElementAllocator.hpp
Index: XalanElemElementAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemElementAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemElementAllocator.hpp 6 Nov 2002 05:08:29 -0000 1.1
+++ XalanElemElementAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemElementAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XalanElemEmptyAllocator.cpp
Index: XalanElemEmptyAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemEmptyAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemEmptyAllocator.cpp 3 Nov 2002 05:50:37 -0000 1.1
+++ XalanElemEmptyAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemEmptyAllocator::XalanElemEmptyAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -118,3 +122,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/XalanElemEmptyAllocator.hpp
Index: XalanElemEmptyAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemEmptyAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanElemEmptyAllocator.hpp 5 Nov 2002 05:19:25 -0000 1.2
+++ XalanElemEmptyAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemEmptyAllocator
{
public:
@@ -189,6 +193,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemLiteralResultAllocator.cpp
Index: XalanElemLiteralResultAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemLiteralResultAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemLiteralResultAllocator.cpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemLiteralResultAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemLiteralResultAllocator::XalanElemLiteralResultAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -78,7 +82,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -98,3 +102,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemLiteralResultAllocator.hpp
Index: XalanElemLiteralResultAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemLiteralResultAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemLiteralResultAllocator.hpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemLiteralResultAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemLiteralResultAllocator
{
public:
@@ -115,7 +119,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -171,6 +175,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemTemplateAllocator.cpp
Index: XalanElemTemplateAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemTemplateAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemTemplateAllocator.cpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemTemplateAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemTemplateAllocator::XalanElemTemplateAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemTemplateAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemTemplateAllocator.hpp
Index: XalanElemTemplateAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemTemplateAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemTemplateAllocator.hpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemTemplateAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemTemplateAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemTextAllocator.cpp
Index: XalanElemTextAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemTextAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemTextAllocator.cpp 3 Nov 2002 05:50:37 -0000 1.1
+++ XalanElemTextAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemTextAllocator::XalanElemTextAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemTextAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XSLT/XalanElemTextAllocator.hpp
Index: XalanElemTextAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemTextAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanElemTextAllocator.hpp 5 Nov 2002 05:19:25 -0000 1.2
+++ XalanElemTextAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemTextAllocator
{
public:
@@ -107,7 +111,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -176,6 +180,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/XalanElemTextLiteralAllocator.cpp
Index: XalanElemTextLiteralAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemTextLiteralAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanElemTextLiteralAllocator.cpp 6 Nov 2002 05:09:48 -0000 1.2
+++ XalanElemTextLiteralAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemTextLiteralAllocator::XalanElemTextLiteralAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -104,3 +108,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/XalanElemTextLiteralAllocator.hpp
Index: XalanElemTextLiteralAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemTextLiteralAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanElemTextLiteralAllocator.hpp 6 Nov 2002 05:09:48 -0000 1.2
+++ XalanElemTextLiteralAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemTextLiteralAllocator
{
public:
@@ -177,6 +181,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemValueOfAllocator.cpp
Index: XalanElemValueOfAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemValueOfAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemValueOfAllocator.cpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemValueOfAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemValueOfAllocator::XalanElemValueOfAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemValueOfAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemValueOfAllocator.hpp
Index: XalanElemValueOfAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemValueOfAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemValueOfAllocator.hpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemValueOfAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemValueOfAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemVariableAllocator.cpp
Index: XalanElemVariableAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemVariableAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemVariableAllocator.cpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemVariableAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanElemVariableAllocator::XalanElemVariableAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -77,7 +81,7 @@
XalanElemVariableAllocator::create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber)
{
@@ -96,3 +100,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XSLT/XalanElemVariableAllocator.hpp
Index: XalanElemVariableAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanElemVariableAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanElemVariableAllocator.hpp 5 Nov 2002 05:19:25 -0000 1.1
+++ XalanElemVariableAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanElemVariableAllocator
{
public:
@@ -113,7 +117,7 @@
create(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- const AttributeList& atts,
+ const AttributeListType& atts,
int lineNumber,
int columnNumber);
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XSLT/XalanNumberingResourceBundle.cpp
Index: XalanNumberingResourceBundle.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanNumberingResourceBundle.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanNumberingResourceBundle.cpp 7 Nov 2002 18:58:07 -0000 1.3
+++ XalanNumberingResourceBundle.cpp 25 Nov 2002 18:11:53 -0000 1.4
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanNumberingResourceBundle::XalanNumberingResourceBundle(
const XalanDOMString& theLanguage,
const XalanDOMString& theUILanguage,
@@ -185,3 +189,7 @@
m_digitsTableTable.swap(theOther.m_digitsTableTable);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XSLT/XalanNumberingResourceBundle.hpp
Index: XalanNumberingResourceBundle.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanNumberingResourceBundle.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanNumberingResourceBundle.hpp 7 Nov 2002 22:45:24 -0000 1.4
+++ XalanNumberingResourceBundle.hpp 25 Nov 2002 18:11:53 -0000 1.5
@@ -73,13 +73,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNumberingResourceBundle
{
public:
typedef unsigned long NumberType;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<NumberType> NumberTypeVectorType;
typedef vector<XalanDOMCharVectorType> DigitsTableVectorType;
#else
@@ -253,6 +257,10 @@
NumberTypeVectorType m_digitsTableTable;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/XalanSourceTreeDocumentAllocator.cpp
Index: XalanSourceTreeDocumentAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanSourceTreeDocumentAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeDocumentAllocator.cpp 18 Apr 2002 04:52:57 -0000 1.2
+++ XalanSourceTreeDocumentAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeDocumentAllocator::XalanSourceTreeDocumentAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -149,3 +153,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/XalanSourceTreeDocumentAllocator.hpp
Index: XalanSourceTreeDocumentAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanSourceTreeDocumentAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeDocumentAllocator.hpp 18 Apr 2002 04:52:57 -0000 1.2
+++ XalanSourceTreeDocumentAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanSourceTreeDocumentAllocator
{
public:
@@ -214,6 +218,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XSLT/XalanSourceTreeDocumentFragmentAllocator.cpp
Index: XalanSourceTreeDocumentFragmentAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanSourceTreeDocumentFragmentAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeDocumentFragmentAllocator.cpp 1 Nov 2001 15:55:15 -0000 1.1
+++ XalanSourceTreeDocumentFragmentAllocator.cpp 25 Nov 2002 18:11:53 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeDocumentFragmentAllocator::XalanSourceTreeDocumentFragmentAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -117,3 +121,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XSLT/XalanSourceTreeDocumentFragmentAllocator.hpp
Index: XalanSourceTreeDocumentFragmentAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanSourceTreeDocumentFragmentAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeDocumentFragmentAllocator.hpp 28 Mar 2002 04:52:27 -0000 1.2
+++ XalanSourceTreeDocumentFragmentAllocator.hpp 25 Nov 2002 18:11:53 -0000 1.3
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XSLT_EXPORT XalanSourceTreeDocumentFragmentAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.45 +7 -13 xml-xalan/c/src/XSLT/XalanTemplate.cpp
Index: XalanTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanTemplate.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- XalanTemplate.cpp 7 Nov 2002 18:58:46 -0000 1.44
+++ XalanTemplate.cpp 25 Nov 2002 18:11:53 -0000 1.45
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -170,10 +170,9 @@
static void
foo(XPathExecutionContext& theExecutionContext)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
- using std::replace;
-#endif
+ XALAN_USING_STD(for_each)
+ XALAN_USING_STD(replace)
+
{
vector<XalanDOMString> theDOMStringVector;
vector<char> theCharVector;
@@ -379,10 +378,7 @@
}
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::sort;
- using std::less;
-#endif
+ XALAN_UISNG_STD(sort)
StylesheetRoot::XalanQNameVectorType theVector;
@@ -515,10 +511,8 @@
}
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
- using std::copy;
-#endif
+ XALAN_UISNG_STD(back_inserter)
+ XALAN_UISNG_STD(copy)
typedef MutableNodeRefList::addNodeInDocOrderFunctor addNodeInDocOrderFunctor;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org