You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by au...@apache.org on 2001/03/09 17:20:24 UTC
cvs commit: xml-xalan/c/src/XSLT TracerEvent.hpp TracerEvent.cpp StylesheetRoot.cpp Stylesheet.cpp ElemVariable.hpp ElemVariable.cpp ElemValueOf.hpp ElemValueOf.cpp ElemUse.hpp ElemUse.cpp ElemTextLiteral.hpp ElemTextLiteral.cpp ElemTemplateElement.hpp ElemTemplateElement.cpp ElemTemplate.hpp ElemTemplate.cpp ElemPI.hpp ElemPI.cpp ElemParam.hpp ElemParam.cpp ElemNumber.hpp ElemNumber.cpp ElemMessage.hpp ElemMessage.cpp ElemLiteralResult.hpp ElemLiteralResult.cpp ElemIf.hpp ElemIf.cpp ElemForEach.hpp ElemForEach.cpp ElemFallback.hpp ElemFallback.cpp ElemExtensionCall.hpp ElemExtensionCall.cpp ElemEmpty.hpp ElemEmpty.cpp ElemElement.hpp ElemElement.cpp ElemDecimalFormat.hpp ElemDecimalFormat.cpp ElemCopyOf.hpp ElemCopyOf.cpp ElemCopy.hpp ElemCopy.cpp ElemComment.hpp ElemComment.cpp ElemChoose.hpp ElemChoose.cpp ElemCallTemplate.hpp ElemCallTemplate.cpp ElemAttributeSet.hpp ElemAttributeSet.cpp ElemAttribute.hpp ElemAttribute.cpp ElemApplyTemplates.hpp ElemApplyTemplates.cpp ElemApplyImport.hpp ElemApplyImport.cpp
auriemma 01/03/09 08:20:24
Modified: c/src/XSLT TracerEvent.hpp TracerEvent.cpp
StylesheetRoot.cpp Stylesheet.cpp ElemVariable.hpp
ElemVariable.cpp ElemValueOf.hpp ElemValueOf.cpp
ElemUse.hpp ElemUse.cpp ElemTextLiteral.hpp
ElemTextLiteral.cpp ElemTemplateElement.hpp
ElemTemplateElement.cpp ElemTemplate.hpp
ElemTemplate.cpp ElemPI.hpp ElemPI.cpp
ElemParam.hpp ElemParam.cpp ElemNumber.hpp
ElemNumber.cpp ElemMessage.hpp ElemMessage.cpp
ElemLiteralResult.hpp ElemLiteralResult.cpp
ElemIf.hpp ElemIf.cpp ElemForEach.hpp
ElemForEach.cpp ElemFallback.hpp ElemFallback.cpp
ElemExtensionCall.hpp ElemExtensionCall.cpp
ElemEmpty.hpp ElemEmpty.cpp ElemElement.hpp
ElemElement.cpp ElemDecimalFormat.hpp
ElemDecimalFormat.cpp ElemCopyOf.hpp ElemCopyOf.cpp
ElemCopy.hpp ElemCopy.cpp ElemComment.hpp
ElemComment.cpp ElemChoose.hpp ElemChoose.cpp
ElemCallTemplate.hpp ElemCallTemplate.cpp
ElemAttributeSet.hpp ElemAttributeSet.cpp
ElemAttribute.hpp ElemAttribute.cpp
ElemApplyTemplates.hpp ElemApplyTemplates.cpp
ElemApplyImport.hpp ElemApplyImport.cpp
Log:
Removed the sourceNode paramater from most element execution functions.
Revision Changes Path
1.7 +1 -7 xml-xalan/c/src/XSLT/TracerEvent.hpp
Index: TracerEvent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TracerEvent.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TracerEvent.hpp 2001/03/06 21:23:04 1.6
+++ TracerEvent.hpp 2001/03/09 16:19:54 1.7
@@ -94,7 +94,6 @@
*/
TracerEvent(
const StylesheetExecutionContext& executionContext,
- const XalanNode* sourceNode,
const ElemTemplateElement& styleNode);
virtual
@@ -128,12 +127,7 @@
* The XSLT processor instance.
*/
const StylesheetExecutionContext& m_executionContext;
-
- /**
- * The current context node.
- */
- const XalanNode* m_sourceNode;
-
+
/**
* The node in the style tree where the event occurs.
*/
1.7 +0 -2 xml-xalan/c/src/XSLT/TracerEvent.cpp
Index: TracerEvent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TracerEvent.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TracerEvent.cpp 2001/03/06 21:23:03 1.6
+++ TracerEvent.cpp 2001/03/09 16:19:55 1.7
@@ -70,10 +70,8 @@
TracerEvent::TracerEvent(
const StylesheetExecutionContext& executionContext,
- const XalanNode* sourceNode,
const ElemTemplateElement& styleNode) :
m_executionContext(executionContext),
- m_sourceNode(sourceNode),
m_styleNode(styleNode)
{
}
1.39 +6 -1 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- StylesheetRoot.cpp 2001/03/06 21:23:02 1.38
+++ StylesheetRoot.cpp 2001/03/09 16:19:55 1.39
@@ -224,9 +224,14 @@
executionContext.startDocument();
+ // why
+ //executionContext.setCurrentNode(sourceTree);
+
+ XPathExecutionContext::CurrentNodeSetAndRestore theCurrentNodeSetAndRestore(executionContext, sourceTree);
+
// Output the action of the found root rule. All processing
// occurs from here.
- rootRule->execute(executionContext, sourceTree);
+ rootRule->execute(executionContext);
// At this point, anything transient during the tranformation
// may have been deleted, so we may not refer to anything the
1.51 +1 -1 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Stylesheet.cpp 2001/03/06 21:22:56 1.50
+++ Stylesheet.cpp 2001/03/09 16:19:55 1.51
@@ -1494,7 +1494,7 @@
if(qname.equals(attrSet->getQName()))
{
- attrSet->execute(executionContext, sourceNode);
+ attrSet->execute(executionContext);
}
}
}
1.14 +2 -4 xml-xalan/c/src/XSLT/ElemVariable.hpp
Index: ElemVariable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemVariable.hpp 2001/03/06 21:22:54 1.13
+++ ElemVariable.hpp 2001/03/09 16:19:56 1.14
@@ -58,7 +58,7 @@
#define XALAN_ELEMVARIABLE_HEADER_GUARD
/**
- * $Id: ElemVariable.hpp,v 1.13 2001/03/06 21:22:54 auriemma Exp $
+ * $Id: ElemVariable.hpp,v 1.14 2001/03/09 16:19:56 auriemma Exp $
*
* $State: Exp $
*
@@ -146,9 +146,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
const XObjectPtr
getValue(
1.15 +3 -5 xml-xalan/c/src/XSLT/ElemVariable.cpp
Index: ElemVariable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemVariable.cpp 2001/03/06 21:22:53 1.14
+++ ElemVariable.cpp 2001/03/09 16:19:56 1.15
@@ -153,13 +153,11 @@
void
-ElemVariable::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemVariable::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
- const XObjectPtr theValue(getValue(executionContext, sourceNode));
+ const XObjectPtr theValue(getValue(executionContext, executionContext.getCurrentNode()));
if (theValue.null() == false)
{
1.12 +1 -3 xml-xalan/c/src/XSLT/ElemValueOf.hpp
Index: ElemValueOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemValueOf.hpp 2001/03/06 21:22:52 1.11
+++ ElemValueOf.hpp 2001/03/09 16:19:56 1.12
@@ -103,9 +103,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
private:
1.22 +5 -5 xml-xalan/c/src/XSLT/ElemValueOf.cpp
Index: ElemValueOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemValueOf.cpp 2001/03/06 21:22:51 1.21
+++ ElemValueOf.cpp 2001/03/09 16:19:56 1.22
@@ -165,18 +165,18 @@
void
-ElemValueOf::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemValueOf::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
if (m_isDot == true)
{
StylesheetExecutionContext::GetAndReleaseCachedString theResult(executionContext);
DOMServices::getNodeData(*sourceNode, theResult.get());
-
+
outputValue(executionContext, theResult.get());
if(0 != executionContext.getTraceListeners())
1.11 +1 -3 xml-xalan/c/src/XSLT/ElemUse.hpp
Index: ElemUse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemUse.hpp 2001/03/06 21:22:50 1.10
+++ ElemUse.hpp 2001/03/09 16:19:57 1.11
@@ -124,9 +124,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
#if defined(XALAN_NO_NAMESPACES)
typedef vector<QNameByValue> QNameVectorType;
1.11 +3 -5 xml-xalan/c/src/XSLT/ElemUse.cpp
Index: ElemUse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemUse.cpp 2001/03/06 21:22:50 1.10
+++ ElemUse.cpp 2001/03/09 16:19:57 1.11
@@ -112,15 +112,13 @@
void
-ElemUse::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemUse::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
if(0 != m_attributeSetsNames.size())
getStylesheet().getStylesheetRoot().applyAttrSets(m_attributeSetsNames,
- executionContext, sourceNode);
+ executionContext, executionContext.getCurrentNode());
}
1.10 +1 -3 xml-xalan/c/src/XSLT/ElemTextLiteral.hpp
Index: ElemTextLiteral.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemTextLiteral.hpp 2001/03/06 21:22:49 1.9
+++ ElemTextLiteral.hpp 2001/03/09 16:19:57 1.10
@@ -134,9 +134,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
private:
1.12 +2 -4 xml-xalan/c/src/XSLT/ElemTextLiteral.cpp
Index: ElemTextLiteral.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemTextLiteral.cpp 2001/03/06 21:22:48 1.11
+++ ElemTextLiteral.cpp 2001/03/09 16:19:57 1.12
@@ -112,11 +112,9 @@
void
-ElemTextLiteral::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemTextLiteral::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
if(!m_disableOutputEscaping)
{
1.26 +10 -9 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemTemplateElement.hpp 2001/03/06 21:22:47 1.25
+++ ElemTemplateElement.hpp 2001/03/09 16:19:57 1.26
@@ -198,18 +198,23 @@
* recursively execute down the element tree.
*
* @param executionContext The current execution context
- * @param sourceNode current context node
*/
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
/**
* Process the children of a template.
*
+ * @param processor XSLT processor instance
+ */
+ void
+ executeChildren(StylesheetExecutionContext& executionContext) const;
+
+ /**
+ * Set the current node and process the children of a template.
+ *
* @param processor XSLT processor instance
- * @param sourceNode current context node
+ * @param sourceNode current node
*/
void
executeChildren(
@@ -221,13 +226,11 @@
* convert it to a string.
*
* @param executionContext The current execution context
- * @param sourceNode current source node context
* @param result result of executing the elements children
*/
void
childrenToString(
StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode,
XalanDOMString& result) const;
@@ -768,8 +771,6 @@
*/
virtual bool
childTypeAllowed(int xslToken) const;
-
-protected:
bool m_finishedConstruction;
1.51 +20 -12 xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ElemTemplateElement.cpp 2001/03/06 21:22:46 1.50
+++ ElemTemplateElement.cpp 2001/03/09 16:19:58 1.51
@@ -89,6 +89,7 @@
#include <XPath/MutableNodeRefList.hpp>
#include <XPath/XObjectFactory.hpp>
+#include <XPath/XPathExecutionContext.hpp>
#include <XPath/XPath.hpp>
@@ -271,37 +272,45 @@
void
ElemTemplateElement::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ StylesheetExecutionContext& executionContext) const
{
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(
- TracerEvent(executionContext, sourceNode, *this));
+ TracerEvent(executionContext, *this));
}
}
void
-ElemTemplateElement::executeChildren(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemTemplateElement::executeChildren(StylesheetExecutionContext& executionContext) const
{
StylesheetExecutionContext::PushAndPopElementFrame thePushAndPop(executionContext, this);
for (ElemTemplateElement* node = m_firstChild; node != 0; node = node->m_nextSibling)
{
- node->execute(executionContext, sourceNode);
+ node->execute(executionContext);
}
}
void
+ElemTemplateElement::executeChildren(
+ StylesheetExecutionContext& executionContext,
+ XalanNode* sourceNode) const
+{
+ XPathExecutionContext::CurrentNodeSetAndRestore theCurrentNodeSetAndRestore(executionContext, sourceNode);
+
+ executeChildren(executionContext);
+}
+
+
+
+void
ElemTemplateElement::childrenToString(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode,
+ StylesheetExecutionContext& executionContext,
XalanDOMString& result) const
{
reserve(result, length(result) + 1024);
@@ -319,7 +328,7 @@
executionContext,
&theFormatter);
- executeChildren(executionContext, sourceNode);
+ executeChildren(executionContext);
}
@@ -973,8 +982,7 @@
{
if(0 != executionContext.getTraceListeners())
{
- TracerEvent te(executionContext,
- child,
+ TracerEvent te(executionContext,
*theTemplate);
executionContext.fireTraceEvent(te);
1.11 +1 -3 xml-xalan/c/src/XSLT/ElemTemplate.hpp
Index: ElemTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemTemplate.hpp 2001/03/06 21:22:45 1.10
+++ ElemTemplate.hpp 2001/03/09 16:19:58 1.11
@@ -151,9 +151,7 @@
// These methods are inherited from ElemTemplateElement ...
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
private:
1.14 +3 -5 xml-xalan/c/src/XSLT/ElemTemplate.cpp
Index: ElemTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemTemplate.cpp 2001/03/06 21:22:44 1.13
+++ ElemTemplate.cpp 2001/03/09 16:19:59 1.14
@@ -159,11 +159,9 @@
void
-ElemTemplate::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemTemplate::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
- executeChildren(executionContext, sourceNode);
+ executeChildren(executionContext);
}
1.11 +1 -3 xml-xalan/c/src/XSLT/ElemPI.hpp
Index: ElemPI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemPI.hpp 2001/03/06 21:22:43 1.10
+++ ElemPI.hpp 2001/03/09 16:19:59 1.11
@@ -103,9 +103,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.13 +3 -5 xml-xalan/c/src/XSLT/ElemPI.cpp
Index: ElemPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemPI.cpp 2001/03/06 21:22:41 1.12
+++ ElemPI.cpp 2001/03/09 16:19:59 1.13
@@ -130,13 +130,12 @@
void
-ElemPI::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemPI::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
XalanDOMString piName;
+ XalanNode* sourceNode = executionContext.getCurrentNode();
m_nameAVT->evaluate(piName, sourceNode, *this, executionContext);
@@ -153,7 +152,6 @@
childrenToString(
executionContext,
- sourceNode,
theResult.get());
executionContext.processingInstruction(c_wstr(piName), c_wstr(theResult.get()));
1.9 +1 -3 xml-xalan/c/src/XSLT/ElemParam.hpp
Index: ElemParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemParam.hpp 2001/03/06 21:22:40 1.8
+++ ElemParam.hpp 2001/03/09 16:19:59 1.9
@@ -95,9 +95,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
};
1.12 +3 -6 xml-xalan/c/src/XSLT/ElemParam.cpp
Index: ElemParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemParam.cpp 2001/03/06 21:22:40 1.11
+++ ElemParam.cpp 2001/03/09 16:19:59 1.12
@@ -96,15 +96,13 @@
void
-ElemParam::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemParam::execute(StylesheetExecutionContext& executionContext) const
{
const XObjectPtr obj = executionContext.getParamVariable(m_qname);
if (obj.null() == true)
{
- ElemVariable::execute(executionContext, sourceNode);
+ ElemVariable::execute(executionContext);
}
else
{
@@ -112,8 +110,7 @@
{
executionContext.fireTraceEvent(
TracerEvent(
- executionContext,
- sourceNode,
+ executionContext,
*this));
}
}
1.28 +12 -16 xml-xalan/c/src/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ElemNumber.hpp 2001/03/06 21:22:39 1.27
+++ ElemNumber.hpp 2001/03/09 16:19:59 1.28
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.27 2001/03/06 21:22:39 auriemma Exp $
+ * $Id: ElemNumber.hpp,v 1.28 2001/03/09 16:19:59 auriemma Exp $
*
* $State: Exp $
*
@@ -150,9 +150,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
/**
* Get the previous node to be counted.
@@ -187,15 +185,15 @@
XalanNode* context,
const XalanElement* namespaceContext) const;
- /**
- * Given a 'from' pattern (ala xsl:number), a match pattern
- * and a context, find the first ancestor that matches the
- * pattern (including the context handed in).
- * @param matchPatternString The match pattern.
- * @param node The node that "." expresses.
- * @param namespaceContext The context in which namespaces in the
- * queries are supposed to be expanded.
- */
+ /**
+ * Given a 'from' pattern (ala xsl:number), a match pattern
+ * and a context, find the first ancestor that matches the
+ * pattern (including the context handed in).
+ * @param matchPatternString The match pattern.
+ * @param node The node that "." expresses.
+ * @param namespaceContext The context in which namespaces in the
+ * queries are supposed to be expanded.
+ */
XalanNode*
findPrecedingOrAncestorOrSelf(
StylesheetExecutionContext& executionContext,
@@ -217,9 +215,7 @@
* parameters set up by the xsl:number attributes.
*/
XalanDOMString
- getCountString(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ getCountString(StylesheetExecutionContext& executionContext) const;
/**
* Get the ancestors, up to the root, that match the
1.42 +6 -9 xml-xalan/c/src/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ElemNumber.cpp 2001/03/06 21:22:38 1.41
+++ ElemNumber.cpp 2001/03/09 16:20:00 1.42
@@ -213,14 +213,11 @@
void
-ElemNumber::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemNumber::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
- const XalanDOMString countString =
- getCountString(executionContext, sourceNode);
+ const XalanDOMString countString = getCountString(executionContext);
if (!isEmpty(countString))
{
@@ -375,10 +372,10 @@
XalanDOMString
-ElemNumber::getCountString(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemNumber::getCountString(StylesheetExecutionContext& executionContext) const
{
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
assert(sourceNode != 0);
IntArrayType numberList;
1.10 +1 -3 xml-xalan/c/src/XSLT/ElemMessage.hpp
Index: ElemMessage.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemMessage.hpp 2001/03/06 21:22:37 1.9
+++ ElemMessage.hpp 2001/03/09 16:20:00 1.10
@@ -97,9 +97,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
class ElemMessageTerminateException : public XSLTProcessorException
{
1.10 +4 -5 xml-xalan/c/src/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemMessage.cpp 2001/03/06 21:22:36 1.9
+++ ElemMessage.cpp 2001/03/09 16:20:00 1.10
@@ -123,17 +123,16 @@
void
-ElemMessage::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemMessage::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
StylesheetExecutionContext::GetAndReleaseCachedString theResult(executionContext);
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
childrenToString(
executionContext,
- sourceNode,
theResult.get());
executionContext.message(theResult.get(), sourceNode, this);
1.18 +1 -3 xml-xalan/c/src/XSLT/ElemLiteralResult.hpp
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ElemLiteralResult.hpp 2001/03/06 21:22:36 1.17
+++ ElemLiteralResult.hpp 2001/03/09 16:20:01 1.18
@@ -119,9 +119,7 @@
StylesheetConstructionContext& constructionContext) const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
#if defined(XALAN_NO_NAMESPACES)
typedef vector<const AVT*> AVTVectorType;
1.33 +4 -6 xml-xalan/c/src/XSLT/ElemLiteralResult.cpp
Index: ElemLiteralResult.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ElemLiteralResult.cpp 2001/03/06 21:22:35 1.32
+++ ElemLiteralResult.cpp 2001/03/09 16:20:01 1.33
@@ -194,13 +194,11 @@
void
-ElemLiteralResult::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemLiteralResult::execute(StylesheetExecutionContext& executionContext) const
{
executionContext.startElement(c_wstr(getElementName()));
- ElemUse::execute(executionContext, sourceNode);
+ ElemUse::execute(executionContext);
m_namespacesHandler.outputResultNamespaces(executionContext);
@@ -227,7 +225,7 @@
StylesheetExecutionContext::GetAndReleaseCachedString theGuard2(executionContext);
- avt->evaluate(theStringedValue, sourceNode, *this, executionContext);
+ avt->evaluate(theStringedValue, executionContext.getCurrentNode(), *this, executionContext);
if (isEmpty(thePrefix) == true ||
shouldExcludeResultNamespaceNode(
@@ -244,7 +242,7 @@
}
}
- executeChildren(executionContext, sourceNode);
+ executeChildren(executionContext);
executionContext.endElement(c_wstr(getElementName()));
}
1.9 +2 -4 xml-xalan/c/src/XSLT/ElemIf.hpp
Index: ElemIf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemIf.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemIf.hpp 2001/03/06 21:22:34 1.8
+++ ElemIf.hpp 2001/03/09 16:20:01 1.9
@@ -58,7 +58,7 @@
#define XALAN_ELEMIF_HEADER_GUARD
/**
- * $Id: ElemIf.hpp,v 1.8 2001/03/06 21:22:34 auriemma Exp $
+ * $Id: ElemIf.hpp,v 1.9 2001/03/09 16:20:01 auriemma Exp $
*
* $State: Exp $
*
@@ -105,9 +105,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
private:
1.13 +5 -5 xml-xalan/c/src/XSLT/ElemIf.cpp
Index: ElemIf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemIf.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemIf.cpp 2001/03/06 21:22:33 1.12
+++ ElemIf.cpp 2001/03/09 16:20:01 1.13
@@ -137,14 +137,14 @@
void
-ElemIf::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemIf::execute(StylesheetExecutionContext& executionContext) const
{
assert(m_test != 0);
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
const XObjectPtr test(m_test->execute(sourceNode, *this, executionContext));
assert(test.null() == false);
@@ -161,6 +161,6 @@
if(test->boolean())
{
- executeChildren(executionContext, sourceNode);
+ executeChildren(executionContext);
}
}
1.10 +1 -3 xml-xalan/c/src/XSLT/ElemForEach.hpp
Index: ElemForEach.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemForEach.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemForEach.hpp 2001/03/06 21:22:32 1.9
+++ ElemForEach.hpp 2001/03/09 16:20:02 1.10
@@ -127,9 +127,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.11 +3 -3 xml-xalan/c/src/XSLT/ElemForEach.cpp
Index: ElemForEach.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemForEach.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemForEach.cpp 2001/03/06 21:22:31 1.10
+++ ElemForEach.cpp 2001/03/09 16:20:02 1.11
@@ -155,10 +155,10 @@
void
-ElemForEach::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemForEach::execute(StylesheetExecutionContext& executionContext) const
{
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
if (sourceNode != 0)
{
assert(m_pSelectPattern != 0);
1.6 +1 -3 xml-xalan/c/src/XSLT/ElemFallback.hpp
Index: ElemFallback.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemFallback.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemFallback.hpp 2001/03/06 21:22:30 1.5
+++ ElemFallback.hpp 2001/03/09 16:20:02 1.6
@@ -97,9 +97,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
private:
1.7 +4 -8 xml-xalan/c/src/XSLT/ElemFallback.cpp
Index: ElemFallback.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemFallback.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemFallback.cpp 2001/03/06 21:22:30 1.6
+++ ElemFallback.cpp 2001/03/09 16:20:02 1.7
@@ -126,9 +126,7 @@
void
-ElemFallback::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemFallback::execute(StylesheetExecutionContext& executionContext) const
{
const ElemTemplateElement* const parent =
getParentNodeElem();
@@ -145,16 +143,14 @@
if(extensionParent->elementAvailable(executionContext) == false)
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
- executeChildren(
- executionContext,
- sourceNode);
+ executeChildren(executionContext);
}
}
else
{
// Should never happen
- executionContext.error("Error! parent of xsl:fallback must be an extension element!", sourceNode, this);
+ executionContext.error("Error! parent of xsl:fallback must be an extension element!", executionContext.getCurrentNode(), this);
}
}
1.10 +1 -3 xml-xalan/c/src/XSLT/ElemExtensionCall.hpp
Index: ElemExtensionCall.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemExtensionCall.hpp 2001/03/06 21:22:29 1.9
+++ ElemExtensionCall.hpp 2001/03/09 16:20:03 1.10
@@ -105,9 +105,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
bool
elementAvailable(StylesheetExecutionContext& executionContext) const;
1.10 +2 -4 xml-xalan/c/src/XSLT/ElemExtensionCall.cpp
Index: ElemExtensionCall.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemExtensionCall.cpp 2001/03/06 21:22:27 1.9
+++ ElemExtensionCall.cpp 2001/03/09 16:20:03 1.10
@@ -96,9 +96,7 @@
void
-ElemExtensionCall::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemExtensionCall::execute(StylesheetExecutionContext& executionContext) const
{
executionContext.warn("Xalan C++ does not yet handle extensions!");
@@ -106,7 +104,7 @@
{
if(child->getXSLToken() == Constants::ELEMNAME_FALLBACK)
{
- child->execute(executionContext, sourceNode);
+ child->execute(executionContext);
}
}
}
1.9 +1 -3 xml-xalan/c/src/XSLT/ElemEmpty.hpp
Index: ElemEmpty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemEmpty.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemEmpty.hpp 2001/03/06 21:22:26 1.8
+++ ElemEmpty.hpp 2001/03/09 16:20:03 1.9
@@ -100,9 +100,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
};
1.8 +2 -4 xml-xalan/c/src/XSLT/ElemEmpty.cpp
Index: ElemEmpty.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemEmpty.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemEmpty.cpp 2001/03/06 21:22:26 1.7
+++ ElemEmpty.cpp 2001/03/09 16:20:03 1.8
@@ -95,11 +95,9 @@
void
-ElemEmpty::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemEmpty::execute(StylesheetExecutionContext& executionContext) const
{
assert(false); // really shouldn't be executing empty nodes
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
}
1.12 +2 -4 xml-xalan/c/src/XSLT/ElemElement.hpp
Index: ElemElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemElement.hpp 2001/03/06 21:22:25 1.11
+++ ElemElement.hpp 2001/03/09 16:20:03 1.12
@@ -58,7 +58,7 @@
#define XALAN_ELEMELEMENT_HEADER_GUARD
/**
- * $Id: ElemElement.hpp,v 1.11 2001/03/06 21:22:25 auriemma Exp $
+ * $Id: ElemElement.hpp,v 1.12 2001/03/09 16:20:03 auriemma Exp $
*
*
* $State: Exp $
@@ -109,9 +109,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.24 +6 -6 xml-xalan/c/src/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ElemElement.cpp 2001/03/06 21:22:24 1.23
+++ ElemElement.cpp 2001/03/09 16:20:04 1.24
@@ -148,14 +148,14 @@
void
-ElemElement::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemElement::execute(StylesheetExecutionContext& executionContext) const
{
StylesheetExecutionContext::GetAndReleaseCachedString elemNameGuard(executionContext);
XalanDOMString& elemName = elemNameGuard.get();
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
m_nameAVT->evaluate(elemName, sourceNode, *this, executionContext);
bool isIllegalElement = false;
@@ -257,7 +257,7 @@
}
}
- ElemUse::execute(executionContext, sourceNode);
+ ElemUse::execute(executionContext);
doExecuteChildren(executionContext, sourceNode, isIllegalElement);
@@ -279,7 +279,7 @@
{
// If we should execute all children, then just call
// executeChildren()...
- executeChildren(executionContext, sourceNode);
+ executeChildren(executionContext);
}
else
{
@@ -289,7 +289,7 @@
{
if (node->getXSLToken() != Constants::ELEMNAME_ATTRIBUTE)
{
- node->execute(executionContext, sourceNode);
+ node->execute(executionContext);
}
}
}
1.8 +1 -3 xml-xalan/c/src/XSLT/ElemDecimalFormat.hpp
Index: ElemDecimalFormat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemDecimalFormat.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemDecimalFormat.hpp 2001/03/06 21:22:23 1.7
+++ ElemDecimalFormat.hpp 2001/03/09 16:20:04 1.8
@@ -105,9 +105,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
const XalanDecimalFormatSymbols&
getDecimalFormatSymbols() const
1.6 +2 -4 xml-xalan/c/src/XSLT/ElemDecimalFormat.cpp
Index: ElemDecimalFormat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemDecimalFormat.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemDecimalFormat.cpp 2001/03/06 21:22:23 1.5
+++ ElemDecimalFormat.cpp 2001/03/09 16:20:04 1.6
@@ -281,9 +281,7 @@
void
-ElemDecimalFormat::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemDecimalFormat::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
}
1.9 +2 -4 xml-xalan/c/src/XSLT/ElemCopyOf.hpp
Index: ElemCopyOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemCopyOf.hpp 2001/03/06 21:22:22 1.8
+++ ElemCopyOf.hpp 2001/03/09 16:20:04 1.9
@@ -58,7 +58,7 @@
#define XALAN_ELEMCOPYOF_HEADER_GUARD
/**
- * $Id: ElemCopyOf.hpp,v 1.8 2001/03/06 21:22:22 auriemma Exp $
+ * $Id: ElemCopyOf.hpp,v 1.9 2001/03/09 16:20:04 auriemma Exp $
*
*
* $State: Exp $
@@ -106,9 +106,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
private:
1.16 +4 -4 xml-xalan/c/src/XSLT/ElemCopyOf.cpp
Index: ElemCopyOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemCopyOf.cpp 2001/03/06 21:22:21 1.15
+++ ElemCopyOf.cpp 2001/03/09 16:20:05 1.16
@@ -119,13 +119,13 @@
void
-ElemCopyOf::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemCopyOf::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
assert(m_pSelectPattern != 0);
+
+ XalanNode* sourceNode = executionContext.getCurrentNode();
const XObjectPtr value(m_pSelectPattern->execute(sourceNode, *this, executionContext));
assert(value.null() == false);
1.9 +2 -3 xml-xalan/c/src/XSLT/ElemCopy.hpp
Index: ElemCopy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemCopy.hpp 2001/03/06 21:22:21 1.8
+++ ElemCopy.hpp 2001/03/09 16:20:05 1.9
@@ -95,9 +95,8 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
+
};
1.13 +10 -16 xml-xalan/c/src/XSLT/ElemCopy.cpp
Index: ElemCopy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemCopy.cpp 2001/03/06 21:22:19 1.12
+++ ElemCopy.cpp 2001/03/09 16:20:05 1.13
@@ -113,14 +113,14 @@
void
-ElemCopy::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemCopy::execute(StylesheetExecutionContext& executionContext) const
{
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
assert(sourceNode != 0);
+
+ const XalanNode::NodeType nodeType = executionContext.getCurrentNode()->getNodeType();
- const XalanNode::NodeType nodeType = sourceNode->getNodeType();
-
if(XalanNode::DOCUMENT_NODE != nodeType)
{
executionContext.cloneToResultTree(
@@ -133,14 +133,11 @@
{
assert(sourceNode != 0);
- ElemUse::execute(
- executionContext,
- sourceNode);
+ ElemUse::execute(executionContext);
executionContext.copyNamespaceAttributes(*sourceNode);
- executeChildren(executionContext,
- sourceNode);
+ executeChildren(executionContext);
const XalanDOMString& s = DOMServices::getNameOfNode(*sourceNode);
@@ -150,8 +147,7 @@
{
if(0 != executionContext.getTraceListeners())
{
- executionContext.fireTraceEvent(TracerEvent(executionContext,
- sourceNode,
+ executionContext.fireTraceEvent(TracerEvent(executionContext,
*this));
}
}
@@ -161,14 +157,12 @@
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(TracerEvent(executionContext,
- sourceNode,
*this));
}
ElemUse::execute(
- executionContext,
- sourceNode);
+ executionContext);
- executeChildren(executionContext, sourceNode);
+ executeChildren(executionContext);
}
}
1.9 +1 -3 xml-xalan/c/src/XSLT/ElemComment.hpp
Index: ElemComment.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemComment.hpp 2001/03/06 21:22:18 1.8
+++ ElemComment.hpp 2001/03/09 16:20:06 1.9
@@ -98,9 +98,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.9 +2 -5 xml-xalan/c/src/XSLT/ElemComment.cpp
Index: ElemComment.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemComment.cpp 2001/03/06 21:22:17 1.8
+++ ElemComment.cpp 2001/03/09 16:20:06 1.9
@@ -114,17 +114,14 @@
void
-ElemComment::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemComment::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
StylesheetExecutionContext::GetAndReleaseCachedString theResult(executionContext);
childrenToString(
executionContext,
- sourceNode,
theResult.get());
executionContext.comment(c_wstr(theResult.get()));
1.9 +1 -3 xml-xalan/c/src/XSLT/ElemChoose.hpp
Index: ElemChoose.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemChoose.hpp 2001/03/06 21:22:16 1.8
+++ ElemChoose.hpp 2001/03/09 16:20:06 1.9
@@ -99,9 +99,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.13 +6 -6 xml-xalan/c/src/XSLT/ElemChoose.cpp
Index: ElemChoose.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemChoose.cpp 2001/03/06 21:22:14 1.12
+++ ElemChoose.cpp 2001/03/09 16:20:07 1.13
@@ -114,12 +114,12 @@
void
-ElemChoose::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemChoose::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
for (const ElemTemplateElement* node = getFirstChildElem();
node != 0;
node = node->getNextSiblingElem())
@@ -154,7 +154,7 @@
if(test->boolean() == true)
{
- node->executeChildren(executionContext, sourceNode);
+ node->executeChildren(executionContext);
break;
}
@@ -162,7 +162,7 @@
else
{
// xsl:otherwise
- node->executeChildren(executionContext, sourceNode);
+ node->executeChildren(executionContext);
}
}
}
1.12 +1 -3 xml-xalan/c/src/XSLT/ElemCallTemplate.hpp
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemCallTemplate.hpp 2001/03/06 21:22:14 1.11
+++ ElemCallTemplate.hpp 2001/03/09 16:20:07 1.12
@@ -102,9 +102,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.15 +5 -5 xml-xalan/c/src/XSLT/ElemCallTemplate.cpp
Index: ElemCallTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemCallTemplate.cpp 2001/03/06 21:22:13 1.14
+++ ElemCallTemplate.cpp 2001/03/09 16:20:07 1.15
@@ -128,12 +128,12 @@
void
-ElemCallTemplate::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemCallTemplate::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
assert(isEmpty(m_templateName.getLocalPart()) == false);
const ElemTemplate* const theTemplate =
@@ -149,7 +149,7 @@
sourceNode,
theTemplate);
- theTemplate->execute(executionContext, sourceNode);
+ theTemplate->execute(executionContext);
}
else
{
1.10 +1 -3 xml-xalan/c/src/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemAttributeSet.hpp 2001/03/06 21:22:12 1.9
+++ ElemAttributeSet.hpp 2001/03/09 16:20:07 1.10
@@ -113,9 +113,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.10 +3 -5 xml-xalan/c/src/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemAttributeSet.cpp 2001/03/06 21:22:11 1.9
+++ ElemAttributeSet.cpp 2001/03/09 16:20:08 1.10
@@ -125,20 +125,18 @@
void
-ElemAttributeSet::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemAttributeSet::execute(StylesheetExecutionContext& executionContext) const
{
// This will push and pop the stack automatically...
StylesheetExecutionContext::ElementRecursionStackPusher thePusher(executionContext, this);
- ElemUse::execute(executionContext, sourceNode);
+ ElemUse::execute(executionContext);
const ElemTemplateElement* attr = getFirstChildElem();
while(0 != attr)
{
- attr->execute(executionContext, sourceNode);
+ attr->execute(executionContext);
attr = attr->getNextSiblingElem();
}
1.9 +2 -4 xml-xalan/c/src/XSLT/ElemAttribute.hpp
Index: ElemAttribute.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemAttribute.hpp 2001/03/06 21:22:10 1.8
+++ ElemAttribute.hpp 2001/03/09 16:20:08 1.9
@@ -58,7 +58,7 @@
#define XALAN_ELEMATTRIBUTE_HEADER_GUARD
/**
- * $Id: ElemAttribute.hpp,v 1.8 2001/03/06 21:22:10 auriemma Exp $
+ * $Id: ElemAttribute.hpp,v 1.9 2001/03/09 16:20:08 auriemma Exp $
*
*
* $State: Exp $
@@ -109,9 +109,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.22 +5 -6 xml-xalan/c/src/XSLT/ElemAttribute.cpp
Index: ElemAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemAttribute.cpp 2001/03/06 21:22:09 1.21
+++ ElemAttribute.cpp 2001/03/09 16:20:08 1.22
@@ -154,18 +154,18 @@
void
-ElemAttribute::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemAttribute::execute(StylesheetExecutionContext& executionContext) const
{
assert(m_pNameAVT != 0);
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
StylesheetExecutionContext::GetAndReleaseCachedString attrNameGuard(executionContext);
XalanDOMString& attrName = attrNameGuard.get();
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
m_pNameAVT->evaluate(attrName, sourceNode, *this, executionContext);
if(!isEmpty(attrName))
@@ -344,8 +344,7 @@
StylesheetExecutionContext::GetAndReleaseCachedString theResult(executionContext);
childrenToString(
- executionContext,
- sourceNode,
+ executionContext,
theResult.get());
executionContext.addResultAttribute(attrName, theResult.get());
1.10 +2 -4 xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp
Index: ElemApplyTemplates.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemApplyTemplates.hpp 2001/03/06 21:22:09 1.9
+++ ElemApplyTemplates.hpp 2001/03/09 16:20:08 1.10
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD
/**
- * $Id: ElemApplyTemplates.hpp,v 1.9 2001/03/06 21:22:09 auriemma Exp $
+ * $Id: ElemApplyTemplates.hpp,v 1.10 2001/03/09 16:20:08 auriemma Exp $
*
* $State: Exp $
*
@@ -130,9 +130,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
protected:
1.14 +4 -4 xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp
Index: ElemApplyTemplates.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemApplyTemplates.cpp 2001/03/06 21:22:08 1.13
+++ ElemApplyTemplates.cpp 2001/03/09 16:20:09 1.14
@@ -139,14 +139,14 @@
void
-ElemApplyTemplates::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemApplyTemplates::execute(StylesheetExecutionContext& executionContext) const
{
+ XalanNode* sourceNode = executionContext.getCurrentNode();
+
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(TracerEvent(
- executionContext, sourceNode, *this));
+ executionContext, *this));
}
if (0 != sourceNode)
{
1.9 +2 -4 xml-xalan/c/src/XSLT/ElemApplyImport.hpp
Index: ElemApplyImport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyImport.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemApplyImport.hpp 2001/03/06 21:22:08 1.8
+++ ElemApplyImport.hpp 2001/03/09 16:20:09 1.9
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYIMPORT_HEADER_GUARD
/**
- * $Id: ElemApplyImport.hpp,v 1.8 2001/03/06 21:22:08 auriemma Exp $
+ * $Id: ElemApplyImport.hpp,v 1.9 2001/03/09 16:20:09 auriemma Exp $
*
* $State: Exp $
*
@@ -104,9 +104,7 @@
getElementName() const;
virtual void
- execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const;
+ execute(StylesheetExecutionContext& executionContext) const;
virtual ElemTemplateElement*
appendChildElem(ElemTemplateElement* newChild);
1.10 +3 -7 xml-xalan/c/src/XSLT/ElemApplyImport.cpp
Index: ElemApplyImport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyImport.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemApplyImport.cpp 2001/03/06 21:22:07 1.9
+++ ElemApplyImport.cpp 2001/03/09 16:20:09 1.10
@@ -116,15 +116,11 @@
void
-ElemApplyImport::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode* sourceNode) const
+ElemApplyImport::execute(StylesheetExecutionContext& executionContext) const
{
- ElemTemplateElement::execute(executionContext, sourceNode);
+ ElemTemplateElement::execute(executionContext);
- // This will have to change to current template, (which will have
- // to be the top of a current template stack).
- assert(sourceNode != 0);
+ XalanNode* sourceNode = executionContext.getCurrentNode();
transformChild(executionContext,
getStylesheet(),
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org