You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/08/16 03:13:41 UTC

svn commit: r686432 [1/4] - in /xalan/c/trunk: Projects/Win32/VC6/AllInOne/ Projects/Win32/VC7.1/AllInOne/ Projects/Win32/VC7/AllInOne/ Projects/Win32/VC8/AllInOne/ Projects/Win32/VC9/AllInOne/ samples/ExternalFunction/ samples/SimpleXPathAPI/ samples/...

Author: dbertoni
Date: Fri Aug 15 18:13:38 2008
New Revision: 686432

URL: http://svn.apache.org/viewvc?rev=686432&view=rev
Log:
Changes for Jira issue XALANC-616, along with some cleanup of unused code.

Removed:
    xalan/c/trunk/src/xalanc/XPath/XSpan.cpp
    xalan/c/trunk/src/xalanc/XPath/XSpan.hpp
Modified:
    xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
    xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
    xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
    xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
    xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
    xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
    xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj
    xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj
    xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj
    xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj
    xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp
    xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
    xalan/c/trunk/samples/TraceListen/TraceListen.cpp
    xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp
    xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
    xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp
    xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
    xalan/c/trunk/src/xalanc/TestXSLT/process.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp
    xalan/c/trunk/src/xalanc/XPath/XBoolean.cpp
    xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp
    xalan/c/trunk/src/xalanc/XPath/XNodeSet.cpp
    xalan/c/trunk/src/xalanc/XPath/XNodeSet.hpp
    xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp
    xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.hpp
    xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.cpp
    xalan/c/trunk/src/xalanc/XPath/XNull.cpp
    xalan/c/trunk/src/xalanc/XPath/XNull.hpp
    xalan/c/trunk/src/xalanc/XPath/XNumber.cpp
    xalan/c/trunk/src/xalanc/XPath/XNumber.hpp
    xalan/c/trunk/src/xalanc/XPath/XNumberAllocator.cpp
    xalan/c/trunk/src/xalanc/XPath/XNumberBase.cpp
    xalan/c/trunk/src/xalanc/XPath/XNumberBase.hpp
    xalan/c/trunk/src/xalanc/XPath/XObject.cpp
    xalan/c/trunk/src/xalanc/XPath/XObject.hpp
    xalan/c/trunk/src/xalanc/XPath/XObjectFactory.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectFactory.hpp
    xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.hpp
    xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.hpp
    xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxyBase.hpp
    xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxyText.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxyText.hpp
    xalan/c/trunk/src/xalanc/XPath/XObjectTypeCallback.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectTypeCallback.hpp
    xalan/c/trunk/src/xalanc/XPath/XPath.cpp
    xalan/c/trunk/src/xalanc/XPath/XPath.hpp
    xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp
    xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.hpp
    xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp
    xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
    xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
    xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp
    xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp
    xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp
    xalan/c/trunk/src/xalanc/XPath/XString.cpp
    xalan/c/trunk/src/xalanc/XPath/XString.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringAdapter.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringAdapter.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringAdapterAllocator.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringAdapterAllocator.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringBase.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringCached.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringCached.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringCachedAllocator.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringCachedAllocator.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringReference.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringReference.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringReferenceAllocator.cpp
    xalan/c/trunk/src/xalanc/XPath/XStringReferenceAllocator.hpp
    xalan/c/trunk/src/xalanc/XPath/XToken.cpp
    xalan/c/trunk/src/xalanc/XPath/XToken.hpp
    xalan/c/trunk/src/xalanc/XPath/XTokenNumberAdapter.cpp
    xalan/c/trunk/src/xalanc/XPath/XTokenNumberAdapter.hpp
    xalan/c/trunk/src/xalanc/XPath/XTokenNumberAdapterAllocator.cpp
    xalan/c/trunk/src/xalanc/XPath/XTokenNumberAdapterAllocator.hpp
    xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapter.cpp
    xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapter.hpp
    xalan/c/trunk/src/xalanc/XPath/XUnknown.cpp
    xalan/c/trunk/src/xalanc/XPath/XUnknown.hpp
    xalan/c/trunk/src/xalanc/XPath/XalanXPathException.hpp
    xalan/c/trunk/src/xalanc/XPathCAPI/XPathCAPI.cpp
    xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionKey.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp
    xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp
    xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp
    xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
    xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp
    xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.hpp
    xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp
    xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.hpp
    xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
    xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
    xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp
    xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp
    xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
    xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp
    xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.cpp

Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp Fri Aug 15 18:13:38 2008
@@ -1406,14 +1406,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\xalanc\XPath\XSpan.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\xalanc\XPath\XSpan.hpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\src\xalanc\XPath\XString.cpp
 # End Source File
 # Begin Source File

Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Fri Aug 15 18:13:38 2008
@@ -1384,14 +1384,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\xalanc\XPath\XSpan.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\xalanc\XPath\XSpan.hpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\src\xalanc\XPath\XString.cpp
 # End Source File
 # Begin Source File

Modified: xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj Fri Aug 15 18:13:38 2008
@@ -1167,12 +1167,6 @@
 				RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.hpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp">
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp">
 			</File>
 			<File

Modified: xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj Fri Aug 15 18:13:38 2008
@@ -1167,12 +1167,6 @@
 				RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.hpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp">
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp">
 			</File>
 			<File

Modified: xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj Fri Aug 15 18:13:38 2008
@@ -1115,12 +1115,6 @@
 				RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.hpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp">
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp">
 			</File>
 			<File

Modified: xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj Fri Aug 15 18:13:38 2008
@@ -1118,12 +1118,6 @@
 				RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.hpp">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp">
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp">
 			</File>
 			<File

Modified: xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj Fri Aug 15 18:13:38 2008
@@ -1980,14 +1980,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp"
 				>
 			</File>

Modified: xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj Fri Aug 15 18:13:38 2008
@@ -1622,14 +1622,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp"
 				>
 			</File>

Modified: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj Fri Aug 15 18:13:38 2008
@@ -1973,14 +1973,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp"
 				>
 			</File>

Modified: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj Fri Aug 15 18:13:38 2008
@@ -1619,14 +1619,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\xalanc\XPath\XSpan.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp"
 				>
 			</File>

Modified: xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp (original)
+++ xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp Fri Aug 15 18:13:38 2008
@@ -89,7 +89,7 @@
 		using std::sqrt;
 #endif
 
-		return executionContext.getXObjectFactory().createNumber(sqrt(args[0]->num()));
+		return executionContext.getXObjectFactory().createNumber(sqrt(args[0]->num(executionContext)));
 	}
 
 #if !defined(XALAN_NO_USING_DECLARATION)
@@ -178,7 +178,7 @@
 		using std::pow;
 #endif
 
-		return executionContext.getXObjectFactory().createNumber(pow(args[0]->num(), 3));
+		return executionContext.getXObjectFactory().createNumber(pow(args[0]->num(executionContext), 3));
 	}
 
 #if !defined(XALAN_NO_USING_DECLARATION)

Modified: xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp (original)
+++ xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp Fri Aug 15 18:13:38 2008
@@ -155,7 +155,7 @@
 
 					cout << "The string value of the result is:"
 						 << endl
-						 << theResult->str()
+                         << theResult->str(theEvaluator.getExecutionContext())
 						 << endl
 						 << endl;
 				}

Modified: xalan/c/trunk/samples/TraceListen/TraceListen.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/TraceListen/TraceListen.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/samples/TraceListen/TraceListen.cpp (original)
+++ xalan/c/trunk/samples/TraceListen/TraceListen.cpp Fri Aug 15 18:13:38 2008
@@ -137,6 +137,7 @@
 			// Set up the TraceListener... 
 			TraceListenerDefault		theTraceListener(				
 					diagnosticsWriter,
+                    theXalanTransformer.getMemoryManager(),
 					traceTemplates,
 					traceTemplateChildren,
 					traceGenerationEvent,

Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp Fri Aug 15 18:13:38 2008
@@ -235,6 +235,89 @@
 
 
 
+void
+DOMServices::doGetNodeData(
+			const XalanNode&	node,
+            ExecutionContext&   executionContext,
+			XalanDOMString&		data)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+    switch(node.getNodeType())
+	{
+	case XalanNode::DOCUMENT_FRAGMENT_NODE:
+		{
+			const XalanDocumentFragment&		theDocumentFragment =
+				static_cast<const XalanDocumentFragment&>(node);
+
+			doGetNodeData(theDocumentFragment, executionContext, data);
+		}
+		break;
+
+	case XalanNode::DOCUMENT_NODE:
+		{
+			const XalanDocument&	theDocument =
+				static_cast<const XalanDocument&>(node);
+
+			doGetNodeData(theDocument, executionContext, data);
+		}
+		break;
+
+	case XalanNode::ELEMENT_NODE:
+		{
+			const XalanElement&		theElement =
+				static_cast<const XalanElement&>(node);
+
+			doGetNodeData(theElement, executionContext, data);
+		}
+		break;
+
+	case XalanNode::TEXT_NODE:
+	case XalanNode::CDATA_SECTION_NODE:
+		{
+			const XalanText&	theTextNode =
+				static_cast<const XalanText&>(node);
+
+				doGetNodeData(theTextNode, executionContext, data);
+		}
+		break;
+
+	case XalanNode::ATTRIBUTE_NODE:
+		{
+			const XalanAttr&		theAttr =
+				static_cast<const XalanAttr&>(node);
+
+			getNodeData(theAttr, data);
+		}
+		break;
+
+	case XalanNode::COMMENT_NODE:
+		{
+			const XalanComment&		theComment =
+				static_cast<const XalanComment&>(node);
+
+			getNodeData(theComment, data);
+		}
+		break;
+
+	case XalanNode::PROCESSING_INSTRUCTION_NODE:
+		{
+			const XalanProcessingInstruction&		thePI =
+				static_cast<const XalanProcessingInstruction&>(node);
+
+			getNodeData(thePI, data);
+		}
+		break;
+
+	default:
+		// ignore
+		break;
+	}
+}
+
+
+
+
 inline void
 getChildData(
 			const XalanNode*	child,
@@ -262,6 +345,35 @@
 
 
 inline void
+getChildData(
+			const XalanNode*	child,
+            ExecutionContext&   executionContext,
+			XalanDOMString&		data)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	const XalanNode::NodeType	theType = child->getNodeType();
+
+	if (theType == XalanNode::ELEMENT_NODE)
+	{
+		const XalanElement*	const	theElementNode =
+				static_cast<const XalanElement*>(child);
+
+		DOMServices::doGetNodeData(*theElementNode, executionContext, data);
+	}
+	else if (theType == XalanNode::TEXT_NODE ||
+			 theType == XalanNode::CDATA_SECTION_NODE)
+	{
+		const XalanText*	theTextNode =
+				static_cast<const XalanText*>(child);
+
+		DOMServices::doGetNodeData(*theTextNode, executionContext, data);
+	}
+}
+
+
+
+inline void
 getChildrenData(
 			const XalanNode*	firstChild,
 			XalanDOMString&		data)
@@ -276,6 +388,24 @@
 
 
 
+inline void
+getChildrenData(
+			const XalanNode*	firstChild,
+            ExecutionContext&   executionContext,
+			XalanDOMString&		data)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	while(firstChild != 0)
+	{
+		getChildData(firstChild, executionContext, data);
+
+		firstChild = firstChild->getNextSibling();
+	}
+}
+
+
+
 void
 DOMServices::getNodeData(
 			const XalanDocument&	document,
@@ -291,6 +421,25 @@
 
 
 void
+DOMServices::doGetNodeData(
+			const XalanDocument&	document,
+            ExecutionContext&       executionContext,
+			XalanDOMString&			data)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+	assert(document.getDocumentElement() != 0);
+
+	getChildrenData(
+        document.getDocumentElement(),
+        executionContext,
+        data);
+}
+
+
+
+
+
+void
 DOMServices::getNodeData(
 			const XalanDocumentFragment&	documentFragment,
 			XalanDOMString&					data)
@@ -307,6 +456,25 @@
 
 
 void
+DOMServices::doGetNodeData(
+			const XalanDocumentFragment&	documentFragment,
+            ExecutionContext&               executionContext,
+			XalanDOMString&					data)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	for(const XalanNode* child = documentFragment.getFirstChild(); child != 0; child = child->getNextSibling())
+	{
+		assert(child != 0);
+
+		getChildData(child, executionContext, data);
+	}
+}
+
+
+
+
+void
 DOMServices::getNodeData(
 			const XalanElement&		element,
 			XalanDOMString&			data)
@@ -317,6 +485,19 @@
 
 
 void
+DOMServices::doGetNodeData(
+			const XalanElement&		element,
+            ExecutionContext&       executionContext,
+			XalanDOMString&			data)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	getChildrenData(element.getFirstChild(), executionContext, data);
+}
+
+
+
+void
 DOMServices::getNodeData(
 			const XalanNode&	node,
 			FormatterListener&	formatterListener,
@@ -396,6 +577,89 @@
 
 
 
+void
+DOMServices::doGetNodeData(
+			const XalanNode&	node,
+            ExecutionContext&   executionContext,
+			FormatterListener&	formatterListener,
+			MemberFunctionPtr	function)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	switch(node.getNodeType())
+	{
+	case XalanNode::DOCUMENT_FRAGMENT_NODE:
+		{
+			const XalanDocumentFragment&		theDocumentFragment =
+				static_cast<const XalanDocumentFragment&>(node);
+
+			doGetNodeData(theDocumentFragment, executionContext, formatterListener, function);
+		}
+		break;
+
+	case XalanNode::DOCUMENT_NODE:
+		{
+			const XalanDocument&	theDocument =
+				static_cast<const XalanDocument&>(node);
+
+			doGetNodeData(theDocument, executionContext, formatterListener, function);
+		}
+		break;
+
+	case XalanNode::ELEMENT_NODE:
+		{
+			const XalanElement&		theElement =
+				static_cast<const XalanElement&>(node);
+
+			doGetNodeData(theElement, executionContext, formatterListener, function);
+		}
+		break;
+
+	case XalanNode::TEXT_NODE:
+	case XalanNode::CDATA_SECTION_NODE:
+		{
+			const XalanText&	theTextNode =
+				static_cast<const XalanText&>(node);
+
+				doGetNodeData(theTextNode, executionContext, formatterListener, function);
+		}
+		break;
+
+	case XalanNode::ATTRIBUTE_NODE:
+		{
+			const XalanAttr&		theAttr =
+				static_cast<const XalanAttr&>(node);
+
+			getNodeData(theAttr, formatterListener, function);
+		}
+		break;
+
+	case XalanNode::COMMENT_NODE:
+		{
+			const XalanComment&		theComment =
+				static_cast<const XalanComment&>(node);
+
+			getNodeData(theComment, formatterListener, function);
+		}
+		break;
+
+	case XalanNode::PROCESSING_INSTRUCTION_NODE:
+		{
+			const XalanProcessingInstruction&		thePI =
+				static_cast<const XalanProcessingInstruction&>(node);
+
+			getNodeData(thePI, formatterListener, function);
+		}
+		break;
+
+	default:
+		// ignore
+		break;
+	}
+}
+
+
+
 inline void
 getChildData(
 			const XalanNode*				child,
@@ -424,6 +688,36 @@
 
 
 inline void
+getChildData(
+			const XalanNode*				child,
+            ExecutionContext&               executionContext,
+			FormatterListener&				formatterListener,
+			DOMServices::MemberFunctionPtr	function)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	const XalanNode::NodeType	theType = child->getNodeType();
+
+	if (theType == XalanNode::ELEMENT_NODE)
+	{
+		const XalanElement*	const	theElementNode =
+				static_cast<const XalanElement*>(child);
+
+		DOMServices::getNodeData(*theElementNode, executionContext, formatterListener, function);
+	}
+	else if (theType == XalanNode::TEXT_NODE ||
+			 theType == XalanNode::CDATA_SECTION_NODE)
+	{
+		const XalanText*	theTextNode =
+				static_cast<const XalanText*>(child);
+
+		DOMServices::getNodeData(*theTextNode, executionContext, formatterListener, function);
+	}
+}
+
+
+
+inline void
 getChildrenData(
 			const XalanNode*				firstChild,
 			FormatterListener&				formatterListener,
@@ -439,13 +733,53 @@
 
 
 
+inline void
+getChildrenData(
+			const XalanNode*				firstChild,
+            ExecutionContext&               executionContext,
+			FormatterListener&				formatterListener,
+			DOMServices::MemberFunctionPtr	function)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	while(firstChild != 0)
+	{
+		getChildData(firstChild, executionContext, formatterListener, function);
+
+		firstChild = firstChild->getNextSibling();
+	}
+}
+
+
+
 void
 DOMServices::getNodeData(
 			const XalanDocument&	document,
 			FormatterListener&		formatterListener,
 			MemberFunctionPtr		function)
 {
-	getChildrenData(document.getDocumentElement(), formatterListener, function);
+	getChildrenData(
+        document.getDocumentElement(),
+        formatterListener,
+        function);
+}
+
+
+
+void
+DOMServices::doGetNodeData(
+			const XalanDocument&	document,
+            ExecutionContext&       executionContext,
+			FormatterListener&		formatterListener,
+			MemberFunctionPtr		function)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	getChildrenData(
+        document.getDocumentElement(),
+        executionContext,
+        formatterListener,
+        function);
 }
 
 
@@ -467,12 +801,52 @@
 
 
 void
+DOMServices::doGetNodeData(
+			const XalanDocumentFragment&	documentFragment,
+            ExecutionContext&               executionContext,
+			FormatterListener&				formatterListener,
+			MemberFunctionPtr				function)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	for(const XalanNode* child = documentFragment.getFirstChild(); child != 0; child = child->getNextSibling())
+	{
+		assert(child != 0);
+
+		getChildData(child, executionContext, formatterListener, function);
+	}
+}
+
+
+
+void
 DOMServices::getNodeData(
 			const XalanElement&		element,
 			FormatterListener&		formatterListener,
 			MemberFunctionPtr		function)
 {
-	getChildrenData(element.getFirstChild(), formatterListener, function);
+	getChildrenData(
+        element.getFirstChild(),
+        formatterListener,
+        function);
+}
+
+
+
+void
+DOMServices::doGetNodeData(
+			const XalanElement&		element,
+            ExecutionContext&       executionContext,
+			FormatterListener&		formatterListener,
+			MemberFunctionPtr		function)
+{
+    assert(executionContext.hasPreserveOrStripSpaceConditions() == true);
+
+	getChildrenData(
+        element.getFirstChild(),
+        executionContext,
+        formatterListener,
+        function);
 }
 
 
@@ -894,59 +1268,4 @@
 
 
 
-XalanNode*
-DOMServices::findOwnerElement(
-			const XalanNode&	attr,
-			XalanNode&			element)
-{
-
-    XalanNode*	parent = 0;
-
-	const XalanNamedNodeMap* const	attrs = element.getAttributes();
-
-	if (attrs != 0)
-	{
-		const XalanSize_t	nAttrs = attrs->getLength();
-
-		for (XalanSize_t i = 0; i < nAttrs; i++)
-		{
-			if (attrs->item(i) == &attr)
-			{
-				parent = &element;
-					
-				break;
-			}
-		}
-	}
-
-	if (parent == 0)
-    {
-		bool		fFound = false;
-
-		XalanNode*	child = element.getFirstChild();
-
-		while (child != 0 && fFound == false)
-		{
-			if (child->getNodeType() == XalanNode::ELEMENT_NODE)
-			{
-				parent = findOwnerElement(attr, *child);
-
-				if (parent != 0)
-				{
-					fFound = true;
-				}
-			}
-
-			if (fFound == false)
-			{
-				child = child->getNextSibling();
-			}
-		}
-    }
-
-	return parent;
-}
-
-
-
 XALAN_CPP_NAMESPACE_END

Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp Fri Aug 15 18:13:38 2008
@@ -36,6 +36,7 @@
 
 
 #include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+#include <xalanc/PlatformSupport/ExecutionContext.hpp>
 #include <xalanc/PlatformSupport/FormatterListener.hpp>
 
 
@@ -81,7 +82,7 @@
 	 * other functions are called.
 	 */
 	static void
-	initialize(MemoryManagerType&      theManager);
+	initialize(MemoryManager&   theManager);
 
 	/**
 	 * Destroy static data.  After thus function is called,
@@ -91,7 +92,6 @@
 	terminate();
 
 
-
 	/**
 	 * Retrieves data for node
 	 * 
@@ -103,6 +103,29 @@
 			const XalanNode&	node,
 			XalanDOMString&		data);
 
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	getNodeData(
+			const XalanNode&    node,
+            ExecutionContext&   context,
+			XalanDOMString&     data)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(node, data);
+        }
+        else
+        {
+            doGetNodeData(node, context, data);
+        }
+    }
+
 
 
 	/**
@@ -135,8 +158,6 @@
 		append(data, comment.getData());
 	}
 
-
-
 	/**
 	 * Retrieves data for node
 	 * 
@@ -148,12 +169,33 @@
 			const XalanDocument&	document,
 			XalanDOMString&			data);
 
-
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param document The DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	getNodeData(
+			const XalanDocument&    document,
+            ExecutionContext&       context,
+			XalanDOMString&         data)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(document, data);
+        }
+        else
+        {
+            doGetNodeData(document, context, data);
+        }
+    }
 
 	/**
 	 * Retrieves data for node
 	 * 
-	 * @param documentFragment DOM node whose data is to be returned
+	 * @param documentFragment The DOM node whose data is to be returned
 	 * @param data a string to which the node's data will be appended
 	 */
 	static void
@@ -161,7 +203,28 @@
 			const XalanDocumentFragment&	documentFragment,
 			XalanDOMString&					data);
 
-
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param documentFragment The DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	getNodeData(
+			const XalanDocumentFragment&	documentFragment,
+            ExecutionContext&               context,
+			XalanDOMString&		            data)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(documentFragment, data);
+        }
+        else
+        {
+            doGetNodeData(documentFragment, context, data);
+        }
+    }
 
 	/**
 	 * Retrieves data for node
@@ -174,6 +237,28 @@
 			const XalanElement&		element,
 			XalanDOMString&			data);
 
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	getNodeData(
+			const XalanElement&     element,
+            ExecutionContext&       context,
+			XalanDOMString&		    data)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(element, data);
+        }
+        else
+        {
+            doGetNodeData(element, context, data);
+        }
+    }
 
 	/**
 	 * Retrieves data for node
@@ -189,8 +274,6 @@
 		append(data, pi.getData());
 	}
 
-
-
 	/**
 	 * Retrieves data for node
 	 * 
@@ -205,6 +288,31 @@
 		append(data, text.getData());
 	}
 
+public:
+
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param text DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	getNodeData(
+			const XalanText&	text,
+            ExecutionContext&   context,
+			XalanDOMString&		data)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(text, data);
+        }
+        else
+        {
+            doGetNodeData(text, context, data);
+        }
+    }
+
     typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);
 
 	/**
@@ -223,6 +331,31 @@
 	/**
 	 * Sends the data for a node to a FormatterListener
 	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param function A pointer to the member function of FormatterListener to call
+	 */
+	static void
+	getNodeData(
+			const XalanNode&	node,
+            ExecutionContext&   context,
+			FormatterListener&	formatterListener,
+			MemberFunctionPtr	function)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(node, formatterListener, function);
+        }
+        else
+        {
+            doGetNodeData(node, context, formatterListener, function);
+        }
+    }
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
 	 * @param attribute DOM node whose data is to be returned
 	 * @param formatterListener the FormatterListener instance to receive the data
 	 * @param fRaw Whether or not the data should be sent raw.
@@ -268,6 +401,31 @@
 	/**
 	 * Sends the data for a node to a FormatterListener
 	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param function A pointer to the member function of FormatterListener to call
+	 */
+	static void
+	getNodeData(
+			const XalanDocument&	document,
+            ExecutionContext&       context,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(document, formatterListener, function);
+        }
+        else
+        {
+            doGetNodeData(document, context, formatterListener, function);
+        }
+    }
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
 	 * @param documentFragment DOM node whose data is to be sent
 	 * @param formatterListener the FormatterListener instance to receive the data
 	 * @param fRaw Whether or not the data should be sent raw.
@@ -281,6 +439,31 @@
 	/**
 	 * Sends the data for a node to a FormatterListener
 	 * 
+	 * @param documentFragment DOM node whose data is to be sent
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param fRaw Whether or not the data should be sent raw.
+	 */
+	static void
+	getNodeData(
+			const XalanDocumentFragment&	documentFragment,
+            ExecutionContext&               context,
+			FormatterListener&				formatterListener,
+			MemberFunctionPtr				function)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(documentFragment, formatterListener, function);
+        }
+        else
+        {
+            doGetNodeData(documentFragment, context, formatterListener, function);
+        }
+    }
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
 	 * @param element DOM node whose data is to be returned
 	 * @param formatterListener the FormatterListener instance to receive the data
 	 * @param fRaw Whether or not the data should be sent raw.
@@ -294,6 +477,31 @@
 	/**
 	 * Sends the data for a node to a FormatterListener
 	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param function A pointer to the member function of FormatterListener to call
+	 */
+	static void
+	getNodeData(
+			const XalanElement&		element,
+            ExecutionContext&       context,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function)
+    {
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(element, formatterListener, function);
+        }
+        else
+        {
+            doGetNodeData(element, context, formatterListener, function);
+        }
+    }
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
 	 * @param pi DOM node whose data is to be returned
 	 * @param formatterListener the FormatterListener instance to receive the data
 	 * @param fRaw Whether or not the data should be sent raw.
@@ -324,6 +532,31 @@
 	}
 
 	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param fRaw Whether or not the data should be sent raw.
+	 */
+	static void
+	getNodeData(
+			const XalanText&	text,
+            ExecutionContext&   context,
+			FormatterListener&	formatterListener,
+			MemberFunctionPtr	function)
+	{
+        if (!context.hasPreserveOrStripSpaceConditions())
+        {
+            getNodeData(text, formatterListener, function);
+        }
+        else
+        {
+            doGetNodeData(text, context, formatterListener, function);
+        }
+	}
+
+	/**
 	 * Retrieve the name of the node, taking into
 	 * account the differences between the DOM and
 	 * XSLT data models.
@@ -503,48 +736,180 @@
 
 private:
 
+    friend void
+    getChildData(
+            const XalanNode*    child,
+            XalanDOMString&     data);
+
+    friend void
+    getChildData(
+            const XalanNode*    child,
+            ExecutionContext&   executionContext,
+            XalanDOMString&     data);
+
+    friend void
+    getChildData(
+			const XalanNode*				child,
+			FormatterListener&				formatterListener,
+			DOMServices::MemberFunctionPtr	function);
+
 	/**
-	 * If necessary, do a brute-force search for an owner element.  This is
-	 * necessary when a given DOM implementation returns 0 for
-	 * XalanAttr::getOwnerElement()
-	 *
-	 * @deprecated We now require DOM Level 2 support, so XalanAttr::getOwnerElement() always works.
-	 *
-	 * @param attr The XalanAttr instance for which to find the owner element
-	 * @return A pointer to the element node that owns the attribute
+	 * Retrieves data for node
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
 	 */
-	static XalanNode*
-	findOwnerElement(const XalanAttr&	attr)
-	{
-		XalanNode* const	theOwnerElement = attr.getOwnerElement();
+    static void
+    doGetNodeData(
+			const XalanNode&	node,
+            ExecutionContext&   executionContext,
+			XalanDOMString&		data);
 
-		if (theOwnerElement != 0)
-		{
-			return theOwnerElement;
-		}
-		else
-		{
-			return findOwnerElement(attr, *attr.getOwnerDocument()->getDocumentElement());
-		}
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param document DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	doGetNodeData(
+			const XalanDocument&    document,
+            ExecutionContext&       context,
+			XalanDOMString&         data);
+
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param documentFragment DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	doGetNodeData(
+			const XalanDocumentFragment&	documentFragment,
+            ExecutionContext&               context,
+			XalanDOMString&		            data);
+
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param element DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	doGetNodeData(
+			const XalanElement&     element,
+            ExecutionContext&       context,
+			XalanDOMString&		    data);
+
+	/**
+	 * Retrieves data for node
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param data a string to which the node's data will be appended
+	 */
+	static void
+	doGetNodeData(
+			const XalanText&	text,
+            ExecutionContext&   context,
+			XalanDOMString&		data)
+    {
+        assert(context.hasPreserveOrStripSpaceConditions() == true);
+
+        if (context.shouldStripSourceNode(text) == false)
+        {
+		    append(data, text.getData());
+        }
 	}
 
 	/**
-	 * If necessary, do a brute-force search for an owner element.  This is
-	 * necessary when a given DOM implementation returns 0 for
-	 * XalanAttr::getOwnerElement()
-	 *
-	 * @deprecated We now require DOM Level 2 support, so XalanAttr::getOwnerElement() always works.
-	 *
-	 * @param attr The XalanAttr instance for which to find the owner element
-	 * @param element The document element
-	 * @return A pointer to the element node that owns the attribute
+	 * Sends the data for a node to a FormatterListener
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param function A pointer to the member function of FormatterListener to call
 	 */
-	static XalanNode*
-	findOwnerElement(
-			const XalanNode&	attr,
-			XalanNode&			element);
+	static void
+	doGetNodeData(
+			const XalanNode&	node,
+            ExecutionContext&   context,
+			FormatterListener&	formatterListener,
+			MemberFunctionPtr	function);
 
 	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param function A pointer to the member function of FormatterListener to call
+	 */
+	static void
+	doGetNodeData(
+			const XalanDocument&	document,
+            ExecutionContext&       context,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function);
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
+	 * @param documentFragment DOM node whose data is to be sent
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param fRaw Whether or not the data should be sent raw.
+	 */
+	static void
+	doGetNodeData(
+			const XalanDocumentFragment&	documentFragment,
+            ExecutionContext&               context,
+			FormatterListener&				formatterListener,
+			MemberFunctionPtr				function);
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param function A pointer to the member function of FormatterListener to call
+	 */
+	static void
+	doGetNodeData(
+			const XalanElement&		element,
+            ExecutionContext&       context,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function);
+
+	/**
+	 * Sends the data for a node to a FormatterListener
+	 * 
+	 * @param node DOM node whose data is to be returned
+     * @param context The current execution context
+	 * @param formatterListener the FormatterListener instance to receive the data
+	 * @param fRaw Whether or not the data should be sent raw.
+	 */
+	static void
+	doGetNodeData(
+			const XalanText&	text,
+            ExecutionContext&   context,
+			FormatterListener&	formatterListener,
+			MemberFunctionPtr	function)
+	{
+        assert(context.hasPreserveOrStripSpaceConditions() == true);
+
+        if (context.shouldStripSourceNode(text) == false)
+        {
+		    sendData(formatterListener, function, text.getData());
+        }
+	}
+
+    /**
 	 * Utility function to send data to a FormatterListener
 	 *
 	 * @param formatterListener The FormatterListener instance.

Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Fri Aug 15 18:13:38 2008
@@ -1034,29 +1034,30 @@
                 // the results can be seen in the browser enclose the actual/expected in CDATA Sections.
 
                 data.msg = "Text based comparison failure";
-		try
-		{
-		  data.expected += XalanDOMString(gline, getMemoryManager());
-		}
-		catch(const XalanDOMString::TranscodingError&)
-		{
-		  data.expected +=
-		    XalanDOMString(
-			"Unable to transcode expected data.",
-			getMemoryManager());
-		}
-
-		try
-		{
-		  data.actual += XalanDOMString(rline, getMemoryManager());
-		}
-		catch(const XalanDOMString::TranscodingError&)
-		{
-		  data.actual +=
-		    XalanDOMString(
-			"Unable to transcode actual data.",
-			getMemoryManager());
-		}
+
+                try
+		        {
+		            data.expected += XalanDOMString(gline, getMemoryManager());
+		        }
+		        catch(const XalanDOMString::TranscodingError&)
+		        {
+		            data.expected +=
+		                XalanDOMString(
+			                "Unable to transcode expected data.",
+			                getMemoryManager());
+		        }
+
+		        try
+		        {
+		            data.actual += XalanDOMString(rline, getMemoryManager());
+		        }
+		        catch(const XalanDOMString::TranscodingError&)
+		        {
+		            data.actual +=
+		                XalanDOMString(
+			                "Unable to transcode actual data.",
+			                getMemoryManager());
+		        }
 
                 data.currentNode = XalanDOMString("Line: ", getMemoryManager());
                 data.currentNode += XalanDOMString(temp, getMemoryManager());

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.cpp Fri Aug 15 18:13:38 2008
@@ -24,8 +24,9 @@
 
 
 
-ExecutionContext::ExecutionContext(MemoryManagerType& m_memoryManager) :
-    m_memoryManager(m_memoryManager)
+ExecutionContext::ExecutionContext(MemoryManager&   m_memoryManager) :
+    m_memoryManager(m_memoryManager),
+    m_hasPreserveOrStripConditions(false)
 {
 }
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp Fri Aug 15 18:13:38 2008
@@ -37,8 +37,10 @@
 
 
 
-class XalanNode;
 class XalanDOMString;
+class XalanNode;
+class XalanText;
+
 
 
 //
@@ -48,8 +50,7 @@
 {
 public:
 
-	explicit
-	ExecutionContext( MemoryManagerType& m_memoryManager);
+	ExecutionContext(MemoryManager&     m_memoryManager);
 
 	virtual
 	~ExecutionContext();
@@ -93,13 +94,39 @@
 			const XalanNode* 		sourceNode = 0,
 			const LocatorType* 		locator = 0) const = 0;
 
-    MemoryManagerType&
+    bool
+    hasPreserveOrStripSpaceConditions() const
+    {
+        return m_hasPreserveOrStripConditions;
+    }
+
+    /**
+     * Determine if a text node should be stripped from the source tree,
+     * as if it weren't there.
+     *
+     * @param textNode text node from the source tree
+     * @return true if the text node should be stripped
+     */
+    virtual bool
+    shouldStripSourceNode(const XalanText&  node) = 0;
+
+    MemoryManager&
     getMemoryManager()
     {
         return m_memoryManager;
     }
+
+    MemoryManager&
+    getExceptionMemoryManager()
+    {
+        return *m_memoryManager.getExceptionMemoryManager();
+    }
+
 protected:
-    MemoryManagerType&              m_memoryManager;
+
+    MemoryManager&  m_memoryManager;
+
+    bool            m_hasPreserveOrStripConditions;
 };
 
 

Modified: xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp Fri Aug 15 18:13:38 2008
@@ -153,11 +153,11 @@
     thePrintWriter.print("Execution of XPath ");
     thePrintWriter.print(theXPathString);
 
-    if (theResult->num() == theExpectedResult)
+    if (theResult->num(theExecutionContext) == theExpectedResult)
     {
         thePrintWriter.println(" succeeded.");
         thePrintWriter.print("The result was ");
-        thePrintWriter.println(theResult->num());
+        thePrintWriter.println(theResult->num(theExecutionContext));
     }
     else
     {
@@ -167,7 +167,7 @@
         thePrintWriter.print("The expected result was ");
         thePrintWriter.println(theExpectedResult);
         thePrintWriter.print("The actual result was ");
-        thePrintWriter.println(theResult->num());
+        thePrintWriter.println(theResult->num(theExecutionContext));
     }
 
     return fError;
@@ -204,11 +204,11 @@
     thePrintWriter.print("Execution of XPath ");
     thePrintWriter.print(theXPathString);
 
-    if (equals(theResult->str(), theExpectedResult) == true)
+    if (equals(theResult->str(theExecutionContext), theExpectedResult) == true)
     {
         thePrintWriter.println(" succeeded.");
         thePrintWriter.print("The result was \"");
-        thePrintWriter.print(theResult->str());
+        thePrintWriter.print(theResult->str(theExecutionContext));
         thePrintWriter.println("\".");
     }
     else
@@ -220,7 +220,7 @@
         thePrintWriter.print(theExpectedResult);
         thePrintWriter.println("\".");
         thePrintWriter.print("The actual result was \"");
-        thePrintWriter.print(theResult->str());
+        thePrintWriter.print(theResult->str(theExecutionContext));
         thePrintWriter.println("\".");
     }
 
@@ -271,11 +271,11 @@
     thePrintWriter.print("Execution of XPath ");
     thePrintWriter.print(theXPathString);
 
-    if (theResult->boolean() == theExpectedResult)
+    if (theResult->boolean(theExecutionContext) == theExpectedResult)
     {
         thePrintWriter.println(" succeeded.");
         thePrintWriter.print("The result was ");
-        thePrintWriter.print(theResult->boolean());
+        thePrintWriter.print(theResult->boolean(theExecutionContext));
         thePrintWriter.println(".");
     }
     else
@@ -287,7 +287,7 @@
         thePrintWriter.print(theExpectedResult);
         thePrintWriter.println("\".");
         thePrintWriter.print("The actual result was \"");
-        thePrintWriter.print(theResult->boolean());
+        thePrintWriter.print(theResult->boolean(theExecutionContext));
         thePrintWriter.println("\".");
     }
 
@@ -734,7 +734,7 @@
                         const NodeRefListBase::size_type    theLength = theResultList.getLength();
 
                         thePrintWriter.print("theResult1->str() == \"");
-                        thePrintWriter.print(theResult1->str());
+                        thePrintWriter.print(theResult1->str(theExecutionContext));
                         thePrintWriter.print("\"");
                         thePrintWriter.println();
 
@@ -764,7 +764,7 @@
                         const NodeRefListBase::size_type    theLength = theResultList.getLength();
 
                         thePrintWriter.print("theResult2->str() == \"");
-                        thePrintWriter.print(theResult2->str());
+                        thePrintWriter.print(theResult2->str(theExecutionContext));
                         thePrintWriter.print("\"");
                         thePrintWriter.println();
 

Modified: xalan/c/trunk/src/xalanc/TestXSLT/process.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXSLT/process.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXSLT/process.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXSLT/process.cpp Fri Aug 15 18:13:38 2008
@@ -716,7 +716,8 @@
 
 TraceListener*
 createTraceListener(
-            MemoryManagerType&      theManager ,
+            XPathExecutionContext&	theExecutionContext,
+            MemoryManager&          theManager,
 			const CmdLineParams&	params,
 			PrintWriter&			diagnosticsWriter)
 {
@@ -726,12 +727,13 @@
 		params.traceSelectionEvent == true)
 	{
 		return new TraceListenerDefault(
+                theExecutionContext,
 				diagnosticsWriter,
+                theManager,
 				params.traceTemplates,
 				params.traceTemplateChildren,
 				params.traceGenerationEvent,
-				params.traceSelectionEvent,
-                theManager);
+				params.traceSelectionEvent);
 	}
 	else
 	{
@@ -784,7 +786,7 @@
 	// Initialize the XSLT subsystem.  This must stay in scope until
 	// we're done with the subsystem, since its destructor shuts down
 	// the subsystem.
-    MemoryManagerType& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
+    MemoryManager&  theManager = XalanMemMgrs::getDefaultXercesMemMgr();
 
 	XSLTInit	theInit(theManager);
 
@@ -844,12 +846,6 @@
 
 	XPathFactoryDefault		theXPathFactory(theManager);
 
-	const XalanAutoPtr<TraceListener>		theTraceListener(
-			createTraceListener(
-                theManager,
-				params,
-				diagnosticsWriter));
-
 	XSLTEngineImpl	processor(
             theManager,
 			xmlParserLiaison,
@@ -860,12 +856,6 @@
 
 	theXSLProcessorSupport.setProcessor(&processor);
 
-	if (theTraceListener.get() != 0)
-	{
-		processor.setTraceSelects(params.traceSelectionEvent);
-		processor.addTraceListener(theTraceListener.get());
-	}
-
 	// Use a different factory type for the stylesheet.  This is an optimization, since
 	// stylesheet XPath instances are built all at once and are deleted all at once when
 	// the stylesheet is destroyed.
@@ -977,6 +967,19 @@
 			theDOMSupport,
 			theXObjectFactory);
 
+	const XalanAutoPtr<TraceListener>		theTraceListener(
+			createTraceListener(
+                theExecutionContext,
+                theManager,
+				params,
+				diagnosticsWriter));
+
+	if (theTraceListener.get() != 0)
+	{
+		processor.setTraceSelects(params.traceSelectionEvent);
+		processor.addTraceListener(theTraceListener.get());
+	}
+
 #if defined(XALAN_USE_ICU)
 	// Create a collation function for the ICU, and have it
 	// cache collators...

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp Fri Aug 15 18:13:38 2008
@@ -57,8 +57,8 @@
 
     XalanDOMString&     theString = theResult.get();
 
-    arg1->str(theString);
-    arg2->str(theString);
+    arg1->str(executionContext, theString);
+    arg2->str(executionContext, theString);
 
     return executionContext.getXObjectFactory().createString(theResult);
 }
@@ -80,9 +80,9 @@
 
     XalanDOMString&         theString = theResult.get();
 
-    arg1->str(theString);
-    arg2->str(theString);
-    arg3->str(theString);
+    arg1->str(executionContext, theString);
+    arg2->str(executionContext, theString);
+    arg3->str(executionContext, theString);
 
     return executionContext.getXObjectFactory().createString(theResult);
 }
@@ -106,7 +106,7 @@
 
     for(; i != theEnd; ++i)
     {
-        (*i)->str(theString);
+        (*i)->str(executionContext, theString);
     }
 
     return executionContext.getXObjectFactory().createString(theResult);

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp Fri Aug 15 18:13:38 2008
@@ -53,8 +53,8 @@
 {
     assert(arg1.null() == false && arg2.null() == false);   
 
-    const XalanDOMString&   str1 = arg1->str();
-    const XalanDOMString&   str2 = arg2->str();
+    const XalanDOMString&   str1 = arg1->str(executionContext);
+    const XalanDOMString&   str2 = arg2->str(executionContext);
 
     bool                    fResult = true;
 

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp Fri Aug 15 18:13:38 2008
@@ -153,7 +153,7 @@
 FunctionID::FunctionIDXObjectTypeCallback::FunctionIDXObjectTypeCallback(
             XPathExecutionContext&  theExecutionContext,
             XalanDOMString&         theResultString) :
-    XObjectTypeCallback(theExecutionContext.getMemoryManager()),
+    XObjectTypeCallback(theExecutionContext),
     m_resultString(theResultString),
     m_executionContext(theExecutionContext)
 {
@@ -174,7 +174,7 @@
             const XObject&  theXObject,
             double          /* theValue */)
 {
-    m_resultString = theXObject.str();
+    m_resultString = theXObject.str(m_executionContext);
 }
 
 
@@ -184,7 +184,7 @@
             const XObject&  theXObject,
             bool            /* theValue */)
 {
-    m_resultString = theXObject.str();
+    m_resultString = theXObject.str(m_executionContext);
 }
 
 
@@ -194,7 +194,7 @@
             const XObject&          theXObject,
             const XalanDOMString&   /* theValue */)
 {
-    m_resultString = theXObject.str();
+    m_resultString = theXObject.str(m_executionContext);
 }
 
 
@@ -204,7 +204,7 @@
             const XObject&                  theXObject,
             const XalanDocumentFragment&    /* theValue */)
 {
-    m_resultString = theXObject.str();
+    m_resultString = theXObject.str(m_executionContext);
 }
 
 
@@ -214,7 +214,7 @@
             const XObject&          theXObject,
             XalanDocumentFragment&  /* theValue */)
 {
-    m_resultString = theXObject.str();
+    m_resultString = theXObject.str(m_executionContext);
 }
 
 
@@ -228,7 +228,7 @@
 
     for (NodeRefListBase::size_type i = 0 ; i < theNodeCount; i++)
     {
-        DOMServices::getNodeData(*theValue.item(i), m_resultString);
+        DOMServices::getNodeData(*theValue.item(i), m_executionContext, m_resultString);
 
         append(m_resultString, XalanDOMChar(XalanUnicode::charSpace));          
     }

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp Fri Aug 15 18:13:38 2008
@@ -72,7 +72,7 @@
 
     bool                    fMatch = false;
 
-    const XalanDOMString&   lang = arg1->str();
+    const XalanDOMString&   lang = arg1->str(executionContext);
 
     while(0 != parent)
     {

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp Fri Aug 15 18:13:38 2008
@@ -81,7 +81,7 @@
 
         XalanDOMString&     theString = theData.get();
 
-        DOMServices::getNodeData(*context, theString);
+        DOMServices::getNodeData(*context, executionContext, theString);
 
         return normalize(executionContext, theString);
     }
@@ -179,7 +179,7 @@
             XPathExecutionContext&  executionContext,
             const XObjectPtr&       theArg) const
 {
-    const XalanDOMString&   theString = theArg->str();
+    const XalanDOMString&   theString = theArg->str(executionContext);
 
     if (needsNormalization(theString) == false)
     {
@@ -189,7 +189,7 @@
         }
         else
         {
-            return executionContext.getXObjectFactory().createStringAdapter(theArg);
+            return executionContext.getXObjectFactory().createStringAdapter(theArg, executionContext);
         }
     }
     else

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp Fri Aug 15 18:13:38 2008
@@ -53,8 +53,10 @@
 {
     assert(arg1.null() == false && arg2.null() == false);   
 
-    const bool  fStartsWith = startsWith(arg1->str(), 
-                            arg2->str());
+    const bool  fStartsWith =
+        startsWith(
+            arg1->str(executionContext), 
+            arg2->str(executionContext));
 
     return executionContext.getXObjectFactory().createBoolean(fStartsWith);
 }

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp Fri Aug 15 18:13:38 2008
@@ -82,7 +82,7 @@
 
         XalanDOMString&     theString = theData.get();
 
-        DOMServices::getNodeData(*context, theString);
+        DOMServices::getNodeData(*context, executionContext, theString);
 
         return executionContext.getXObjectFactory().createString(theData);
     }
@@ -107,7 +107,7 @@
     }
     else
     {
-        return executionContext.getXObjectFactory().createStringAdapter(arg1);
+        return executionContext.getXObjectFactory().createStringAdapter(arg1, executionContext);
     }
 }
 

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp Fri Aug 15 18:13:38 2008
@@ -104,6 +104,7 @@
  */
 inline XalanDOMString::size_type
 getSubstringLength(
+            XPathExecutionContext&      executionContext,
             XalanDOMString::size_type   theSourceStringLength,
 			XalanDOMString::size_type	theStartIndex,
 			double						theSecondArgValue,
@@ -128,7 +129,7 @@
     }
     else
     {
-		const double	theThirdArgValue = arg3->num();
+		const double	theThirdArgValue = arg3->num(executionContext);
 
 		if (DoubleSupport::isNaN(theThirdArgValue) == true ||
 			DoubleSupport::isNegativeInfinity(theThirdArgValue) == true)
@@ -224,7 +225,7 @@
 {
     assert(arg1.null() == false && arg2.null() == false);   
 
-    const XalanDOMString&               theSourceString = arg1->str();
+    const XalanDOMString&               theSourceString = arg1->str(executionContext);
     const XalanDOMString::size_type     theSourceStringLength = length(theSourceString);
 
     if (theSourceStringLength == 0)
@@ -235,7 +236,7 @@
     {
         // Get the value of the second argument...
         const double    theSecondArgValue =
-            DoubleSupport::round(arg2->num());
+            DoubleSupport::round(arg2->num(executionContext));
 
 		// XPath indexes from 1, so this is the first XPath index....
         const XalanDOMString::size_type     theStartIndex =
@@ -252,6 +253,7 @@
 
 			const XalanDOMString::size_type		theSubstringLength =
                 getSubstringLength(
+                    executionContext,
 					theSourceStringLength,
 					theStartIndex,
 					theSecondArgValue,

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp Fri Aug 15 18:13:38 2008
@@ -64,7 +64,7 @@
 {
     assert(arg1.null() == false && arg2.null() == false);
 
-    const XalanDOMString&               theFirstString = arg1->str();
+    const XalanDOMString&               theFirstString = arg1->str(executionContext);
 
     const XalanDOMString::size_type     theFirstStringLength = length(theFirstString);
 
@@ -74,7 +74,7 @@
     }
     else
     {
-        const XalanDOMString&   theSecondString = arg2->str();
+        const XalanDOMString&   theSecondString = arg2->str(executionContext);
 
         const XalanDOMString::size_type     theSecondStringLength = length(theSecondString);
 

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp Fri Aug 15 18:13:38 2008
@@ -64,7 +64,7 @@
 {
     assert(arg1.null() == false && arg2.null() == false);
 
-    const XalanDOMString&               theFirstString = arg1->str();
+    const XalanDOMString&               theFirstString = arg1->str(executionContext);
 
     const XalanDOMString::size_type     theFirstStringLength = length(theFirstString);
 
@@ -74,7 +74,7 @@
     }
     else
     {
-        const XalanDOMString&               theSecondString = arg2->str();
+        const XalanDOMString&               theSecondString = arg2->str(executionContext);
 
         const XalanDOMString::size_type     theSecondStringLength = length(theSecondString);
 

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp Fri Aug 15 18:13:38 2008
@@ -57,9 +57,9 @@
 {
     assert(arg1.null() == false && arg2.null() == false && arg3.null() == false);
 
-    const XalanDOMString&   theFirstString = arg1->str();
-    const XalanDOMString&   theSecondString = arg2->str();
-    const XalanDOMString&   theThirdString = arg3->str();
+    const XalanDOMString&   theFirstString = arg1->str(executionContext);
+    const XalanDOMString&   theSecondString = arg2->str(executionContext);
+    const XalanDOMString&   theThirdString = arg3->str(executionContext);
 
     const XalanDOMString::size_type     theFirstStringLength = length(theFirstString);
     const XalanDOMString::size_type     theSecondStringLength = length(theSecondString);

Modified: xalan/c/trunk/src/xalanc/XPath/XBoolean.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XBoolean.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XBoolean.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XBoolean.cpp Fri Aug 15 18:13:38 2008
@@ -32,16 +32,20 @@
 
 
 
-XBoolean::XBoolean(bool		val) :
-	XObject(eTypeBoolean),
+XBoolean::XBoolean(
+            bool		    val,
+            MemoryManager&  theMemoryManager) :
+	XObject(eTypeBoolean, theMemoryManager),
 	m_value(val)
 {
 }
 
 
 
-XBoolean::XBoolean(const XBoolean&	source) :
-	XObject(source),
+XBoolean::XBoolean(
+            const XBoolean&     source,
+            MemoryManager&      theMemoryManager) :
+	XObject(source, theMemoryManager),
 	m_value(source.m_value)
 {
 }
@@ -65,7 +69,7 @@
 
 
 double
-XBoolean::num() const
+XBoolean::num(XPathExecutionContext&    /* executionContext */) const
 {
 	return number(m_value);
 }
@@ -73,7 +77,7 @@
 
 
 bool
-XBoolean::boolean() const
+XBoolean::boolean(XPathExecutionContext&    /* executionContext */) const
 {
 	return m_value;
 }
@@ -81,6 +85,14 @@
 
 
 const XalanDOMString&
+XBoolean::str(XPathExecutionContext&    /* executionContext */) const
+{
+	return string(m_value);
+}
+
+
+
+const XalanDOMString&
 XBoolean::str() const
 {
 	return string(m_value);
@@ -90,16 +102,45 @@
 
 void
 XBoolean::str(
-			FormatterListener&	formatterListener,
-			MemberFunctionPtr	function) const
+            XPathExecutionContext&  /* executionContext */,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const
+{
+	string(m_value, formatterListener, function);
+}
+
+
+
+void
+XBoolean::str(
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const
 {
 	string(m_value, formatterListener, function);
 }
 
 
 
+void
+XBoolean::str(
+            XPathExecutionContext&  /* executionContext */,
+            XalanDOMString&	        theBuffer) const
+{
+    string(m_value, theBuffer);
+}
+
+
+
+void
+XBoolean::str(XalanDOMString&   theBuffer) const
+{
+    string(m_value, theBuffer);
+}
+
+
+
 double
-XBoolean::stringLength() const
+XBoolean::stringLength(XPathExecutionContext&   /* executionContext */) const
 {
     assert(
         s_trueString.length() == 4 &&
@@ -113,7 +154,9 @@
 void
 XBoolean::ProcessXObjectTypeCallback(XObjectTypeCallback&	theCallbackObject)
 {
-	theCallbackObject.Boolean(*this, boolean());
+    theCallbackObject.Boolean(
+        *this,
+        boolean(theCallbackObject.getExecutionContext()));
 }
 
 
@@ -121,7 +164,9 @@
 void
 XBoolean::ProcessXObjectTypeCallback(XObjectTypeCallback&	theCallbackObject) const
 {
-	theCallbackObject.Boolean(*this, boolean());
+	theCallbackObject.Boolean(
+        *this,
+        boolean(theCallbackObject.getExecutionContext()));
 }
 
 

Modified: xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp Fri Aug 15 18:13:38 2008
@@ -43,11 +43,22 @@
 	/**
 	 * Construct an XBoolean object from a boolean value
 	 * 
-	 * @param val		boolean value to initialize object
+	 * @param val	The boolean value to initialize object
+	 * @param theMemoryManager The MemoryManager instance.
 	 */
-	XBoolean(bool	val);
+	XBoolean(
+            bool	        val,
+            MemoryManager&  theMemoryManager);
 
-	XBoolean(const XBoolean&	source);
+	/**
+	 * Construct an XBoolean object from another.
+	 * 
+	 * @param source The source XBoolean instance.
+	 * @param theMemoryManager The MemoryManager instance.
+	 */
+	XBoolean(
+            const XBoolean&	    source,
+            MemoryManager&      theMemoryManager);
 
 	virtual
 	~XBoolean();
@@ -58,25 +69,42 @@
 	getTypeString() const;
 
 	virtual double
-	num() const;
+	num(XPathExecutionContext&  executionContext) const;
 
 	virtual bool
-	boolean() const;
+	boolean(XPathExecutionContext&  executionContext) const;
+
+	virtual const XalanDOMString&
+	str(XPathExecutionContext&  executionContext) const;
 
 	virtual const XalanDOMString&
 	str() const;
 
 	virtual void
 	str(
-			FormatterListener&	formatterListener,
-			MemberFunctionPtr	function) const;
+            XPathExecutionContext&  executionContext,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const;
+
+	virtual void
+	str(
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const;
+
+	virtual void
+	str(
+            XPathExecutionContext&  executionContext,
+            XalanDOMString&	        theBuffer) const;
+
+	virtual void
+	str(XalanDOMString&     theBuffer) const;
 
 #if !defined(XALAN_NO_USING_DECLARATION)
 	using ParentType::str;
 #endif
 
 	virtual double
-	stringLength() const;
+	stringLength(XPathExecutionContext&     executionContext) const;
 
 	virtual void
 	ProcessXObjectTypeCallback(XObjectTypeCallback&		theCallbackObject);

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSet.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSet.cpp Fri Aug 15 18:13:38 2008
@@ -44,17 +44,19 @@
 
 
 
-XNodeSet::XNodeSet(BorrowReturnMutableNodeRefList&	value,
-                   MemoryManagerType& theManager) :
-XNodeSetBase(theManager),
-m_value(value)
+XNodeSet::XNodeSet(
+            BorrowReturnMutableNodeRefList&	    value,
+            MemoryManager&                      theMemoryManager) :
+    XNodeSetBase(theMemoryManager),
+    m_value(value)
 {
 }
 
+
+
 XNodeSet::XNodeSet(const XNodeSet&	source,
-                   MemoryManagerType& theManager,
-				   bool				/* deepClone */) :
-	XNodeSetBase(source, theManager),
+                   MemoryManager&   theMemoryManager) :
+	XNodeSetBase(source, theMemoryManager),
 	m_value(source.m_value.clone())
 {
 }

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSet.hpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSet.hpp Fri Aug 15 18:13:38 2008
@@ -51,19 +51,20 @@
 	 * Create an XNodeSet from a node list.
 	 *
 	 * @param value Pointer to source node list.  The XNodeSet will adopt the pointer.
+	 * @param theMemoryManager The MemoryManager for the instance.
 	 */
-	XNodeSet(BorrowReturnMutableNodeRefList&	value,
-             MemoryManagerType& theManager);
+	XNodeSet(
+            BorrowReturnMutableNodeRefList&	    value,
+            MemoryManager&                      theMemoryManager);
 	/**
 	 * Create an XNodeSet from another.
 	 *
 	 * @param source    object to copy
-	 * @param deepClone true to copy all children on nodeset nodes
+	 * @param theMemoryManager The MemoryManager for the instance.
 	 */
 	XNodeSet(
 			const XNodeSet&		source,
-            MemoryManagerType&  theManager,
-			bool				deepClone = false);
+            MemoryManager&      theMemoryManager);
 
 	virtual
 	~XNodeSet();

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp Fri Aug 15 18:13:38 2008
@@ -47,20 +47,22 @@
 
 
 
-XNodeSetBase::XNodeSetBase(MemoryManagerType& theManager) :
-	XObject(eTypeNodeSet),
+XNodeSetBase::XNodeSetBase(MemoryManager&   theMemoryManager) :
+	XObject(eTypeNodeSet, theMemoryManager),
 	m_proxy(*this),
-	m_cachedStringValue(theManager),
+	m_cachedStringValue(theMemoryManager),
 	m_cachedNumberValue(theBogusNumberValue)
 {
 }
 
 
 
-XNodeSetBase::XNodeSetBase(const XNodeSetBase&	source, MemoryManagerType& theManager) :
-	XObject(source),
+XNodeSetBase::XNodeSetBase(
+            const XNodeSetBase&	    source,
+            MemoryManager&          theMemoryManager) :
+	XObject(source, theMemoryManager),
 	m_proxy(*this),
-	m_cachedStringValue(source.m_cachedStringValue, theManager),
+	m_cachedStringValue(source.m_cachedStringValue, theMemoryManager),
 	m_cachedNumberValue(source.m_cachedNumberValue)
 {
 }
@@ -82,11 +84,14 @@
 
 
 double
-XNodeSetBase::num() const
+XNodeSetBase::num(XPathExecutionContext&    executionContext) const
 {
 	if (DoubleSupport::equal(m_cachedNumberValue, theBogusNumberValue) == true)
 	{
-		m_cachedNumberValue = DoubleSupport::toDouble(str(),getMemoryManager());
+		m_cachedNumberValue =
+            DoubleSupport::toDouble(
+                str(executionContext),
+                getMemoryManager());
 	}
 
 	return m_cachedNumberValue;
@@ -95,7 +100,7 @@
 
 
 bool
-XNodeSetBase::boolean() const
+XNodeSetBase::boolean(XPathExecutionContext&    /* executionContext */) const
 {
 	return getLength() > 0 ? true : false;
 }
@@ -103,15 +108,37 @@
 
 
 const XalanDOMString&
+XNodeSetBase::str(XPathExecutionContext&    executionContext) const
+{
+    if (m_cachedStringValue.empty() == true &&
+		getLength() > 0)
+	{
+		const XalanNode* const	theNode = item(0);
+		assert(theNode != 0);
+
+		DOMServices::getNodeData(
+            *theNode,
+            executionContext,
+            m_cachedStringValue);
+	}
+
+	return m_cachedStringValue;
+}
+
+
+
+const XalanDOMString&
 XNodeSetBase::str() const
 {
-	if (isEmpty(m_cachedStringValue) == true &&
+    if (m_cachedStringValue.empty() == true &&
 		getLength() > 0)
 	{
 		const XalanNode* const	theNode = item(0);
 		assert(theNode != 0);
 
-		DOMServices::getNodeData(*theNode, m_cachedStringValue);
+		DOMServices::getNodeData(
+            *theNode,
+            m_cachedStringValue);
 	}
 
 	return m_cachedStringValue;
@@ -121,46 +148,97 @@
 
 void
 XNodeSetBase::str(
-			FormatterListener&	formatterListener,
-			MemberFunctionPtr	function) const
+            XPathExecutionContext&  executionContext,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const
 {
-	if (isEmpty(m_cachedStringValue) == false)
+    if (m_cachedStringValue.empty() == false)
+	{
+        XObject::string(m_cachedStringValue, formatterListener, function);
+	}
+	else if (getLength() > 0)
 	{
-		assert(length(m_cachedStringValue) == FormatterListener::size_type(length(m_cachedStringValue)));
+		const XalanNode* const	theNode = item(0);
+		assert(theNode != 0);
 
-		(formatterListener.*function)(c_wstr(m_cachedStringValue), FormatterListener::size_type(length(m_cachedStringValue)));
+		DOMServices::getNodeData(
+            *theNode,
+            executionContext,
+            formatterListener,
+            function);
+	}
+}
+
+
+
+void
+XNodeSetBase::str(
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const
+{
+    if (m_cachedStringValue.empty() == false)
+	{
+        XObject::string(m_cachedStringValue, formatterListener, function);
 	}
 	else if (getLength() > 0)
 	{
 		const XalanNode* const	theNode = item(0);
 		assert(theNode != 0);
 
-		DOMServices::getNodeData(*theNode, formatterListener, function);
+		DOMServices::getNodeData(
+            *theNode,
+            formatterListener,
+            function);
 	}
 }
 
 
 
 void
-XNodeSetBase::str(XalanDOMString&	theBuffer) const
+XNodeSetBase::str(
+            XPathExecutionContext&  executionContext,
+            XalanDOMString&         theBuffer) const
 {
-	if (isEmpty(m_cachedStringValue) == false)
+    if (m_cachedStringValue.empty() == false)
+	{
+		theBuffer.append(m_cachedStringValue);
+	}
+	else if (getLength() > 0)
+	{
+		const XalanNode* const	theNode = item(0);
+		assert(theNode != 0);
+
+		DOMServices::getNodeData(
+            *theNode,
+            executionContext,
+            theBuffer);
+	}
+}
+
+
+
+void
+XNodeSetBase::str(XalanDOMString&   theBuffer) const
+{
+    if (m_cachedStringValue.empty() == false)
 	{
-		append(theBuffer, m_cachedStringValue);
+		theBuffer.append(m_cachedStringValue);
 	}
 	else if (getLength() > 0)
 	{
 		const XalanNode* const	theNode = item(0);
 		assert(theNode != 0);
 
-		DOMServices::getNodeData(*theNode, theBuffer);
+		DOMServices::getNodeData(
+            *theNode,
+            theBuffer);
 	}
 }
 
 
 
 double
-XNodeSetBase::stringLength() const
+XNodeSetBase::stringLength(XPathExecutionContext&   executionContext) const
 {
     if (m_cachedStringValue.empty() == false)
 	{
@@ -177,7 +255,11 @@
 
 		FormatterStringLengthCounter	theCounter;
 
-		DOMServices::getNodeData(*theNode, theCounter, &FormatterListener::characters);
+		DOMServices::getNodeData(
+            *theNode,
+            executionContext,
+            theCounter,
+            &FormatterListener::characters);
 
 		return static_cast<double>(theCounter.getCount());
 	}
@@ -196,8 +278,9 @@
 void
 XNodeSetBase::ProcessXObjectTypeCallback(XObjectTypeCallback&	theCallbackObject)
 {
-	theCallbackObject.NodeSet(*this,
-							  nodeset());
+	theCallbackObject.NodeSet(
+        *this,
+		nodeset());
 }
 
 
@@ -205,8 +288,9 @@
 void
 XNodeSetBase::ProcessXObjectTypeCallback(XObjectTypeCallback&	theCallbackObject) const
 {
-	theCallbackObject.NodeSet(*this,
-							  nodeset());
+	theCallbackObject.NodeSet(
+        *this,
+		nodeset());
 }
 
 

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.hpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.hpp Fri Aug 15 18:13:38 2008
@@ -51,12 +51,6 @@
 	virtual
 	~XNodeSetBase();
 
-    MemoryManagerType&
-    getMemoryManager()const
-    {
-        return m_cachedStringValue.getMemoryManager();
-    }
-
 	// These methods are inherited from XObject ...
 
 
@@ -64,24 +58,38 @@
 	getTypeString() const;
 
 	virtual double
-	num() const;
+	num(XPathExecutionContext&  executionContext) const;
 
 	virtual bool
-	boolean() const;
+	boolean(XPathExecutionContext&  executionContext) const;
+
+	virtual const XalanDOMString&
+	str(XPathExecutionContext&  executionContext) const;
 
 	virtual const XalanDOMString&
 	str() const;
 
 	virtual void
 	str(
-			FormatterListener&	formatterListener,
-			MemberFunctionPtr	function) const;
+            XPathExecutionContext&  executionContext,
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const;
+
+	virtual void
+	str(
+			FormatterListener&	    formatterListener,
+			MemberFunctionPtr	    function) const;
 
 	virtual void
-	str(XalanDOMString&	theBuffer) const;
+	str(
+            XPathExecutionContext&  executionContext,
+            XalanDOMString&	        theBuffer) const;
+
+	virtual void
+	str(XalanDOMString&     theBuffer) const;
 
 	virtual double
-	stringLength() const;
+	stringLength(XPathExecutionContext&     executionContext) const;
 
 	virtual const XalanDocumentFragment&
 	rtree() const;
@@ -89,7 +97,7 @@
 	virtual const NodeRefListBase&
 	nodeset() const = 0;
 
-	virtual void
+    virtual void
 	ProcessXObjectTypeCallback(XObjectTypeCallback&		theCallbackObject);
 
 	virtual void
@@ -106,14 +114,16 @@
 	/**
 	 * Create an XNodeSetBase
 	 */
-	XNodeSetBase(MemoryManagerType& theManager);
+	XNodeSetBase(MemoryManager&     theMemoryManager);
 
 	/**
 	 * Create an XNodeSetBase from another.
 	 *
 	 * @param source    object to copy
 	 */
-	XNodeSetBase(const XNodeSetBase&	source, MemoryManagerType& theManager);
+	XNodeSetBase(
+        const XNodeSetBase&	    source,
+        MemoryManager&          theMemoryManager);
 
 	void
 	clearCachedValues();

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.cpp?rev=686432&r1=686431&r2=686432&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.cpp Fri Aug 15 18:13:38 2008
@@ -75,16 +75,20 @@
 
 
 
-XNodeSetNodeProxy::XNodeSetNodeProxy(MemoryManagerType& theManager, XalanNode*		theNode) :
-	XNodeSetBase(theManager),
+XNodeSetNodeProxy::XNodeSetNodeProxy(
+            MemoryManager&  theMemoryManager,
+            XalanNode*		theNode) :
+	XNodeSetBase(theMemoryManager),
 	m_proxy(theNode)
 {
 }
 
 
 
-XNodeSetNodeProxy::XNodeSetNodeProxy(const XNodeSetNodeProxy&	source, MemoryManagerType& theManager) :
-	XNodeSetBase(source, theManager),
+XNodeSetNodeProxy::XNodeSetNodeProxy(
+            const XNodeSetNodeProxy&	source,
+            MemoryManager&              theMemoryManager) :
+	XNodeSetBase(source, theMemoryManager),
 	m_proxy(source.m_proxy)
 {
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org