dbertoni 01/04/30 11:13:11
Modified: c/src/XSLT AVT.cpp ElemForEach.cpp ElemLiteralResult.cpp
Stylesheet.cpp
StylesheetConstructionContextDefault.cpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetHandler.cpp XSLTEngineImpl.cpp
XSLTProcessorEnvSupportDefault.cpp
Log:
Changes required to move STLHelper.hpp to Include. Use new cache template.
Revision Changes Path
1.10 +4 -1 xml-xalan/c/src/XSLT/AVT.cpp
Index: AVT.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVT.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AVT.cpp 2000/11/02 01:46:17 1.9
+++ AVT.cpp 2001/04/30 18:12:47 1.10
@@ -62,9 +62,12 @@
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/DOMStringHelper.hpp>
#include <PlatformSupport/StringTokenizer.hpp>
-#include <PlatformSupport/STLHelper.hpp>
#include <PlatformSupport/XalanUnicode.hpp>
1.13 +4 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemForEach.cpp 2001/03/29 22:24:25 1.12
+++ ElemForEach.cpp 2001/04/30 18:12:48 1.13
@@ -67,8 +67,11 @@
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/DOMStringHelper.hpp>
-#include <PlatformSupport/STLHelper.hpp>
1.34 +4 -1 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ElemLiteralResult.cpp 2001/03/09 16:20:01 1.33
+++ ElemLiteralResult.cpp 2001/04/30 18:12:49 1.34
@@ -67,9 +67,12 @@
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/DoubleSupport.hpp>
#include <PlatformSupport/StringTokenizer.hpp>
-#include <PlatformSupport/STLHelper.hpp>
1.53 +3 -3 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Stylesheet.cpp 2001/04/12 14:20:51 1.52
+++ Stylesheet.cpp 2001/04/30 18:12:50 1.53
@@ -70,15 +70,15 @@
-#include <XalanDOM/XalanDOMException.hpp>
+#include <Include/STLHelper.hpp>
-#include <DOMSupport/DOMServices.hpp>
+#include <XalanDOM/XalanDOMException.hpp>
-#include <PlatformSupport/STLHelper.hpp>
+#include <DOMSupport/DOMServices.hpp>
1.15 +4 -1
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StylesheetConstructionContextDefault.cpp 2001/03/29 22:24:26 1.14
+++ StylesheetConstructionContextDefault.cpp 2001/04/30 18:12:52 1.15
@@ -65,7 +65,10 @@
-#include <PlatformSupport/STLHelper.hpp>
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/URISupport.hpp>
1.62 +11 -60
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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- StylesheetExecutionContextDefault.cpp 2001/04/11 02:36:22 1.61
+++ StylesheetExecutionContextDefault.cpp 2001/04/30 18:12:53 1.62
@@ -66,8 +66,11 @@
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/DOMStringHelper.hpp>
-#include <PlatformSupport/STLHelper.hpp>
#include <PlatformSupport/XalanOutputStream.hpp>
#include <PlatformSupport/XalanNumberFormat.hpp>
#include <PlatformSupport/XalanOutputStreamPrintWriter.hpp>
@@ -88,7 +91,6 @@
#include <XMLSupport/FormatterToDOM.hpp>
#include <XMLSupport/FormatterToXML.hpp>
#include <XMLSupport/FormatterToHTML.hpp>
-#include <XMLSupport/FormatterToText.hpp>
#include <XMLSupport/XMLParserLiaison.hpp>
@@ -149,8 +151,7 @@
m_ignoreHTMLElementNamespaces(false),
m_sourceTreeResultTreeFactory(),
m_mode(0),
- m_availableCachedFormattersToText(),
- m_busyCachedFormattersToText()
+ m_formatterToTextCache()
{
}
@@ -182,8 +183,7 @@
m_ignoreHTMLElementNamespaces(false),
m_sourceTreeResultTreeFactory(),
m_mode(0),
- m_availableCachedFormattersToText(),
- m_busyCachedFormattersToText()
+ m_formatterToTextCache()
{
}
@@ -192,15 +192,6 @@
StylesheetExecutionContextDefault::~StylesheetExecutionContextDefault()
{
reset();
-
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
- for_each(
- m_availableCachedFormattersToText.begin(),
- m_availableCachedFormattersToText.end(),
- DeleteFunctor<FormatterToText>());
}
@@ -272,7 +263,7 @@
void
-StylesheetExecutionContextDefault::setCurrentMode(const QName* theMode)
+StylesheetExecutionContextDefault::setCurrentMode(const QName* theMode)
{
m_mode = theMode;
}
@@ -280,8 +271,7 @@
void
-StylesheetExecutionContextDefault::resetCurrentState(
- XalanNode* xmlNode)
+StylesheetExecutionContextDefault::resetCurrentState(XalanNode*
xmlNode)
{
assert(m_xsltProcessor != 0);
@@ -1218,20 +1208,7 @@
FormatterToText*
StylesheetExecutionContextDefault::borrowFormatterToText()
{
- // We'll always return the back of the free list, since
- // that's the cheapest thing.
- if (m_availableCachedFormattersToText.size() == 0)
- {
- m_busyCachedFormattersToText.push_back(new FormatterToText);
- }
- else
- {
-
m_busyCachedFormattersToText.push_back(m_availableCachedFormattersToText.back());
-
- m_availableCachedFormattersToText.pop_back();
- }
-
- return m_busyCachedFormattersToText.back();
+ return m_formatterToTextCache.get();
}
@@ -1239,28 +1216,7 @@
bool
StylesheetExecutionContextDefault::returnFormatterToText(FormatterToText*
theFormatter)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
-
- const FormatterToTextCacheType::iterator i =
- find(
- m_busyCachedFormattersToText.begin(),
- m_busyCachedFormattersToText.end(),
- theFormatter);
-
- if (i == m_busyCachedFormattersToText.end())
- {
- return false;
- }
- else
- {
- m_availableCachedFormattersToText.push_back(theFormatter);
-
- m_busyCachedFormattersToText.erase(i);
-
- return true;
- }
+ return m_formatterToTextCache.release(theFormatter);
}
@@ -1494,12 +1450,7 @@
m_mode = 0;
- while (m_busyCachedFormattersToText.size() != 0)
- {
-
m_availableCachedFormattersToText.push_back(m_busyCachedFormattersToText.back());
-
- m_busyCachedFormattersToText.pop_back();
- }
+ m_formatterToTextCache.reset();
// Just in case endDocument() was not called,
// clean things up...
1.56 +9 -3
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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- StylesheetExecutionContextDefault.hpp 2001/04/11 02:36:22 1.55
+++ StylesheetExecutionContextDefault.hpp 2001/04/30 18:12:54 1.56
@@ -74,10 +74,18 @@
+#include <Include/XalanObjectCache.hpp>
+
+
+
#include <XPath/XPathExecutionContextDefault.hpp>
+#include <XMLSupport/FormatterToText.hpp>
+
+
+
#if defined(XALAN_AUTO_PTR_REQUIRES_DEFINITION)
#include <XalanSourceTree/XalanSourceTreeDocument.hpp>
#endif
@@ -1028,10 +1036,8 @@
// Holds the current mode.
const QName* m_mode;
-
- FormatterToTextCacheType
m_availableCachedFormattersToText;
- FormatterToTextCacheType
m_busyCachedFormattersToText;
+ XalanObjectCacheDefault<FormatterToText> m_formatterToTextCache;
/**
* The factory that will be used to create result tree fragments based
on our
1.62 +9 -7 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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- StylesheetHandler.cpp 2001/03/29 22:24:26 1.61
+++ StylesheetHandler.cpp 2001/04/30 18:12:55 1.62
@@ -68,15 +68,11 @@
-#include <XalanDOM/XalanDOMException.hpp>
-
+#include <Include/STLHelper.hpp>
-#include <DOMSupport/DOMServices.hpp>
-
-
-#include <XMLSupport/Formatter.hpp>
+#include <XalanDOM/XalanDOMException.hpp>
@@ -84,8 +80,14 @@
#include <PlatformSupport/DOMStringHelper.hpp>
#include <PlatformSupport/DoubleSupport.hpp>
#include <PlatformSupport/StringTokenizer.hpp>
-#include <PlatformSupport/STLHelper.hpp>
+
+
+#include <DOMSupport/DOMServices.hpp>
+
+
+
+#include <XMLSupport/Formatter.hpp>
1.95 +17 -1 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.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- XSLTEngineImpl.cpp 2001/03/29 22:24:26 1.94
+++ XSLTEngineImpl.cpp 2001/04/30 18:12:57 1.95
@@ -85,8 +85,11 @@
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/PrintWriter.hpp>
-#include <PlatformSupport/STLHelper.hpp>
#include <PlatformSupport/StringTokenizer.hpp>
#include <PlatformSupport/XalanUnicode.hpp>
@@ -147,6 +150,13 @@
+//#define XALAN_VQ_SPECIAL_TRACE
+#if defined(XALAN_VQ_SPECIAL_TRACE)
+#include "C:/Program Files/Rational/Quantify/pure.h"
+#endif
+
+
+
const XalanDOMString XSLTEngineImpl::s_emptyString;
@@ -577,11 +587,17 @@
pushTime(&xmlIdentifier);
+#if defined(XALAN_VQ_SPECIAL_TRACE)
+ QuantifyStartRecordingData();
+#endif
XalanDocument* const theDocument =
m_parserLiaison.parseXMLStream(inputSource,
xmlIdentifier);
assert(theDocument != 0);
+#if defined(XALAN_VQ_SPECIAL_TRACE)
+ QuantifyStopRecordingData();
+#endif
if(0 != m_diagnosticsPrintWriter)
displayDuration(XALAN_STATIC_UCODE_STRING("Parse of ") +
xmlIdentifier,
1.21 +4 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XSLTProcessorEnvSupportDefault.cpp 2001/03/29 22:24:27 1.20
+++ XSLTProcessorEnvSupportDefault.cpp 2001/04/30 18:12:59 1.21
@@ -68,8 +68,11 @@
+#include <Include/STLHelper.hpp>
+
+
+
#include <PlatformSupport/DOMStringHelper.hpp>
-#include <PlatformSupport/STLHelper.hpp>
#include <PlatformSupport/URISupport.hpp>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
