dbertoni 00/05/15 08:56:02
Modified: c/src/XSLT XSLTProcessorEnvSupportDefault.hpp
XSLTProcessorEnvSupportDefault.cpp
XSLTProcessorEnvSupport.hpp XSLTProcessor.hpp
StylesheetExecutionContextDefault.hpp
StylesheetExecutionContextDefault.cpp
Log:
Fixed bugs in source node stripping.
Revision Changes Path
1.9 +3 -1 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp
Index: XSLTProcessorEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSLTProcessorEnvSupportDefault.hpp 2000/05/01 15:13:11 1.8
+++ XSLTProcessorEnvSupportDefault.hpp 2000/05/15 15:56:00 1.9
@@ -228,7 +228,9 @@
XLocator* xlocator);
virtual bool
- shouldStripSourceNode(const XalanNode& node) const;
+ shouldStripSourceNode(
+ XPathExecutionContext& executionContext,
+ const XalanNode& node) const;
virtual bool
problem(
1.11 +5 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XSLTProcessorEnvSupportDefault.cpp 2000/05/12 18:21:34 1.10
+++ XSLTProcessorEnvSupportDefault.cpp 2000/05/15 15:56:00 1.11
@@ -412,15 +412,17 @@
bool
-XSLTProcessorEnvSupportDefault::shouldStripSourceNode(const XalanNode&
node) const
+XSLTProcessorEnvSupportDefault::shouldStripSourceNode(
+ XPathExecutionContext& executionContext,
+ const XalanNode& node) const
{
if (m_processor == 0)
{
- return m_defaultSupport.shouldStripSourceNode(node);
+ return m_defaultSupport.shouldStripSourceNode(executionContext,
node);
}
else
{
- return m_processor->shouldStripSourceNode(node);
+ return m_processor->shouldStripSourceNode(executionContext,
node);
}
}
1.4 +3 -1 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.hpp
Index: XSLTProcessorEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSLTProcessorEnvSupport.hpp 2000/05/01 15:13:11 1.3
+++ XSLTProcessorEnvSupport.hpp 2000/05/15 15:56:00 1.4
@@ -157,7 +157,9 @@
XLocator* xlocator) = 0;
virtual bool
- shouldStripSourceNode(const XalanNode& node) const = 0;
+ shouldStripSourceNode(
+ XPathExecutionContext& executionContext,
+ const XalanNode& node) const = 0;
virtual bool
problem(
1.8 +9 -3 xml-xalan/c/src/XSLT/XSLTProcessor.hpp
Index: XSLTProcessor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessor.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLTProcessor.hpp 2000/04/20 16:47:35 1.7
+++ XSLTProcessor.hpp 2000/05/15 15:56:00 1.8
@@ -389,7 +389,8 @@
* @param key name of the param
* @param expression expression that will be evaluated
*/
- virtual void setStylesheetParam(
+ virtual void
+ setStylesheetParam(
const XalanDOMString& key,
const XalanDOMString& expression) = 0;
@@ -400,11 +401,16 @@
* node. Literal elements from template elements should <em>not</em> be
* tested with this function.
*
- * @param textNode text node from the source tree
+ * @param executionContext current execution context
+ * @param node text node from the source tree
* @return true if the text node should be stripped of extra whitespace
+ *
+ * $$$ ToDo: This has no business being here in the engine...
*/
virtual bool
- shouldStripSourceNode(const XalanNode& textNode) const = 0;
+ shouldStripSourceNode(
+ XPathExecutionContext& executionContext,
+ const XalanNode& node) const = 0;
/**
* Get the current formatter listener.
1.11 +1 -4
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StylesheetExecutionContextDefault.hpp 2000/05/08 17:29:36 1.10
+++ StylesheetExecutionContextDefault.hpp 2000/05/15 15:56:00 1.11
@@ -252,9 +252,6 @@
setCurrentStackFrameIndex(int currentStackFrameIndex = -1);
virtual void
- markGlobalStackFrame();
-
- virtual void
startDocument();
virtual void
@@ -493,7 +490,7 @@
const XalanDocument& theDocument) const;
virtual bool
- shouldStripSourceNode(const XalanNode& node) const;
+ shouldStripSourceNode(const XalanNode& node);
virtual bool
getThrowFoundIndex() const;
1.10 +1 -9
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StylesheetExecutionContextDefault.cpp 2000/05/08 17:29:35 1.9
+++ StylesheetExecutionContextDefault.cpp 2000/05/15 15:56:00 1.10
@@ -510,14 +510,6 @@
void
-StylesheetExecutionContextDefault::markGlobalStackFrame()
-{
- m_xsltProcessor.getVariableStacks().markGlobalStackFrame();
-}
-
-
-
-void
StylesheetExecutionContextDefault::startDocument()
{
m_xsltProcessor.startDocument();
@@ -1051,7 +1043,7 @@
bool
-StylesheetExecutionContextDefault::shouldStripSourceNode(const XalanNode&
node) const
+StylesheetExecutionContextDefault::shouldStripSourceNode(const XalanNode&
node)
{
return m_xpathExecutionContextDefault.shouldStripSourceNode(node);
}
