auriemma 01/03/02 07:39:55
Modified: c/src/XSLT ElemApplyImport.cpp ElemApplyImport.hpp
ElemApplyTemplates.cpp ElemApplyTemplates.hpp
ElemAttribute.cpp ElemAttribute.hpp
ElemAttributeSet.cpp ElemAttributeSet.hpp
ElemCallTemplate.cpp ElemCallTemplate.hpp
ElemChoose.cpp ElemChoose.hpp ElemComment.cpp
ElemComment.hpp ElemCopy.cpp ElemCopy.hpp
ElemCopyOf.cpp ElemCopyOf.hpp ElemDecimalFormat.cpp
ElemDecimalFormat.hpp ElemElement.cpp
ElemElement.hpp ElemEmpty.cpp ElemEmpty.hpp
ElemExtensionCall.cpp ElemExtensionCall.hpp
ElemFallback.cpp ElemFallback.hpp ElemForEach.cpp
ElemForEach.hpp ElemIf.cpp ElemIf.hpp
ElemLiteralResult.cpp ElemLiteralResult.hpp
ElemMessage.cpp ElemMessage.hpp ElemNumber.cpp
ElemNumber.hpp ElemParam.cpp ElemParam.hpp
ElemPI.cpp ElemPI.hpp ElemTemplate.cpp
ElemTemplate.hpp ElemTemplateElement.cpp
ElemTemplateElement.hpp ElemTextLiteral.cpp
ElemTextLiteral.hpp ElemUse.cpp ElemUse.hpp
ElemValueOf.cpp ElemValueOf.hpp ElemVariable.cpp
ElemVariable.hpp Stylesheet.cpp Stylesheet.hpp
StylesheetExecutionContext.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetRoot.cpp TracerEvent.cpp TracerEvent.hpp
VariablesStack.cpp XSLTEngineImpl.cpp
XSLTEngineImpl.hpp XSLTProcessor.hpp
Log:
Removed the sourceTree paramater from most element execution functions.
Revision Changes Path
1.8 +3 -5 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemApplyImport.cpp 2001/02/12 02:34:51 1.7
+++ ElemApplyImport.cpp 2001/03/02 15:34:06 1.8
@@ -117,12 +117,11 @@
void
ElemApplyImport::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
// This will have to change to current template, (which will have
// to be the top of a current template stack).
@@ -131,8 +130,7 @@
transformChild(executionContext,
getStylesheet(),
0,
- 0,
- sourceTree,
+ 0,
DOMServices::getParentOfNode(*sourceNode),
sourceNode,
mode,
1.7 +2 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemApplyImport.hpp 2001/02/12 02:34:51 1.6
+++ ElemApplyImport.hpp 2001/03/02 15:34:11 1.7
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYIMPORT_HEADER_GUARD
/**
- * $Id: ElemApplyImport.hpp,v 1.6 2001/02/12 02:34:51 dbertoni Exp $
+ * $Id: ElemApplyImport.hpp,v 1.7 2001/03/02 15:34:11 auriemma Exp $
*
* $State: Exp $
*
@@ -105,8 +105,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.12 +5 -9 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemApplyTemplates.cpp 2001/02/12 02:34:51 1.11
+++ ElemApplyTemplates.cpp 2001/03/02 15:34:14 1.12
@@ -134,15 +134,14 @@
void
ElemApplyTemplates::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(TracerEvent(
- executionContext, sourceTree, sourceNode, mode, *this));
+ executionContext, sourceNode, mode, *this));
}
if (0 != sourceNode)
{
@@ -153,8 +152,7 @@
StylesheetExecutionContext::ParamsPushPop thePushPop(
executionContext,
this,
- *this,
- sourceTree,
+ *this,
sourceNode,
mode,
this);
@@ -165,8 +163,7 @@
executionContext,
getStylesheet(),
*this,
- 0,
- sourceTree,
+ 0,
sourceNode,
m_mode,
m_pSelectPattern,
@@ -179,8 +176,7 @@
executionContext,
getStylesheet(),
*this,
- 0,
- sourceTree,
+ 0,
sourceNode,
mode,
m_pSelectPattern,
1.8 +1 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemApplyTemplates.hpp 2001/02/12 02:34:51 1.7
+++ ElemApplyTemplates.hpp 2001/03/02 15:34:17 1.8
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD
/**
- * $Id: ElemApplyTemplates.hpp,v 1.7 2001/02/12 02:34:51 dbertoni Exp $
+ * $Id: ElemApplyTemplates.hpp,v 1.8 2001/03/02 15:34:17 auriemma Exp $
*
* $State: Exp $
*
@@ -129,7 +129,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.20 +3 -5 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemAttribute.cpp 2001/02/12 02:34:51 1.19
+++ ElemAttribute.cpp 2001/03/02 15:34:20 1.20
@@ -155,14 +155,13 @@
void
ElemAttribute::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
assert(m_pNameAVT != 0);
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
StylesheetExecutionContext::GetAndReleaseCachedString
attrNameGuard(executionContext);
@@ -346,8 +345,7 @@
StylesheetExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
childrenToString(
- executionContext,
- sourceTree,
+ executionContext,
sourceNode,
mode,
theResult.get());
1.7 +2 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemAttribute.hpp 2001/02/12 02:34:51 1.6
+++ ElemAttribute.hpp 2001/03/02 15:34:22 1.7
@@ -58,7 +58,7 @@
#define XALAN_ELEMATTRIBUTE_HEADER_GUARD
/**
- * $Id: ElemAttribute.hpp,v 1.6 2001/02/12 02:34:51 dbertoni Exp $
+ * $Id: ElemAttribute.hpp,v 1.7 2001/03/02 15:34:22 auriemma Exp $
*
*
* $State: Exp $
@@ -110,8 +110,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.8 +3 -4 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemAttributeSet.cpp 2001/02/12 02:34:51 1.7
+++ ElemAttributeSet.cpp 2001/03/02 15:34:25 1.8
@@ -126,21 +126,20 @@
void
ElemAttributeSet::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
// This will push and pop the stack automatically...
StylesheetExecutionContext::ElementRecursionStackPusher
thePusher(executionContext, this);
- ElemUse::execute(executionContext, sourceTree, sourceNode, mode);
+ ElemUse::execute(executionContext, sourceNode, mode);
const ElemTemplateElement* attr = getFirstChildElem();
while(0 != attr)
{
- attr->execute(executionContext, sourceTree, sourceNode, mode);
+ attr->execute(executionContext, sourceNode, mode);
attr = attr->getNextSiblingElem();
}
1.8 +1 -2 xml-xalan/c/src/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemAttributeSet.hpp 2001/02/12 02:34:51 1.7
+++ ElemAttributeSet.hpp 2001/03/02 15:34:26 1.8
@@ -114,8 +114,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.13 +4 -6 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemCallTemplate.cpp 2001/02/12 02:34:51 1.12
+++ ElemCallTemplate.cpp 2001/03/02 15:34:28 1.13
@@ -129,12 +129,11 @@
void
ElemCallTemplate::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
assert(isEmpty(m_templateName.getLocalPart()) == false);
@@ -147,13 +146,12 @@
StylesheetExecutionContext::ParamsPushPop thePushPop(
executionContext,
theTemplate,
- *this,
- sourceTree,
+ *this,
sourceNode,
mode,
theTemplate);
- theTemplate->execute(executionContext, sourceTree, sourceNode,
mode);
+ theTemplate->execute(executionContext, sourceNode, mode);
}
else
{
1.10 +1 -2 xml-xalan/c/src/XSLT/ElemCallTemplate.hpp
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemCallTemplate.hpp 2001/02/12 02:34:51 1.9
+++ ElemCallTemplate.hpp 2001/03/02 15:34:30 1.10
@@ -103,8 +103,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.11 +4 -5 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemChoose.cpp 2001/02/12 02:34:51 1.10
+++ ElemChoose.cpp 2001/03/02 15:34:31 1.11
@@ -115,12 +115,11 @@
void
ElemChoose::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
for (const ElemTemplateElement* node = getFirstChildElem();
node != 0;
@@ -156,7 +155,7 @@
if(test->boolean() == true)
{
- node->executeChildren(executionContext,
sourceTree, sourceNode, mode);
+ node->executeChildren(executionContext,
sourceNode, mode);
break;
}
@@ -164,7 +163,7 @@
else
{
// xsl:otherwise
- node->executeChildren(executionContext, sourceTree,
sourceNode, mode);
+ node->executeChildren(executionContext, sourceNode,
mode);
}
}
}
1.7 +1 -2 xml-xalan/c/src/XSLT/ElemChoose.hpp
Index: ElemChoose.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemChoose.hpp 2001/02/12 02:34:51 1.6
+++ ElemChoose.hpp 2001/03/02 15:34:33 1.7
@@ -100,8 +100,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.7 +2 -4 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemComment.cpp 2001/02/12 02:34:51 1.6
+++ ElemComment.cpp 2001/03/02 15:34:35 1.7
@@ -115,18 +115,16 @@
void
ElemComment::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
StylesheetExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
childrenToString(
executionContext,
- sourceTree,
sourceNode,
mode,
theResult.get());
1.7 +1 -2 xml-xalan/c/src/XSLT/ElemComment.hpp
Index: ElemComment.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemComment.hpp 2001/02/12 02:34:51 1.6
+++ ElemComment.hpp 2001/03/02 15:34:37 1.7
@@ -99,8 +99,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.11 +7 -13 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemCopy.cpp 2001/02/12 02:34:51 1.10
+++ ElemCopy.cpp 2001/03/02 15:34:39 1.11
@@ -114,8 +114,7 @@
void
ElemCopy::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -136,15 +135,13 @@
assert(sourceNode != 0);
ElemUse::execute(
- executionContext,
- sourceTree,
+ executionContext,
sourceNode,
mode);
executionContext.copyNamespaceAttributes(*sourceNode);
- executeChildren(executionContext,
- sourceTree,
+ executeChildren(executionContext,
sourceNode,
mode);
@@ -156,8 +153,7 @@
{
if(0 != executionContext.getTraceListeners())
{
-
executionContext.fireTraceEvent(TracerEvent(executionContext,
- sourceTree,
+
executionContext.fireTraceEvent(TracerEvent(executionContext,
sourceNode,
mode,
*this));
@@ -168,19 +164,17 @@
{
if(0 != executionContext.getTraceListeners())
{
-
executionContext.fireTraceEvent(TracerEvent(executionContext,
- sourceTree,
+
executionContext.fireTraceEvent(TracerEvent(executionContext,
sourceNode,
mode,
*this));
}
ElemUse::execute(
- executionContext,
- sourceTree,
+ executionContext,
sourceNode,
mode);
- executeChildren(executionContext, sourceTree, sourceNode, mode);
+ executeChildren(executionContext, sourceNode, mode);
}
}
1.7 +1 -2 xml-xalan/c/src/XSLT/ElemCopy.hpp
Index: ElemCopy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemCopy.hpp 2001/02/12 02:34:51 1.6
+++ ElemCopy.hpp 2001/03/02 15:34:41 1.7
@@ -96,8 +96,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
};
1.14 +2 -3 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemCopyOf.cpp 2001/02/12 02:34:51 1.13
+++ ElemCopyOf.cpp 2001/03/02 15:34:42 1.14
@@ -120,12 +120,11 @@
void
ElemCopyOf::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
assert(m_pSelectPattern != 0);
1.7 +2 -3 xml-xalan/c/src/XSLT/ElemCopyOf.hpp
Index: ElemCopyOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemCopyOf.hpp 2001/02/12 02:34:51 1.6
+++ ElemCopyOf.hpp 2001/03/02 15:34:44 1.7
@@ -58,7 +58,7 @@
#define XALAN_ELEMCOPYOF_HEADER_GUARD
/**
- * $Id: ElemCopyOf.hpp,v 1.6 2001/02/12 02:34:51 dbertoni Exp $
+ * $Id: ElemCopyOf.hpp,v 1.7 2001/03/02 15:34:44 auriemma Exp $
*
*
* $State: Exp $
@@ -107,8 +107,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.4 +2 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemDecimalFormat.cpp 2001/02/12 02:34:51 1.3
+++ ElemDecimalFormat.cpp 2001/03/02 15:34:47 1.4
@@ -282,11 +282,10 @@
void
ElemDecimalFormat::execute(
- StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext& executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
// $$$ ToDo: Fix this!!!
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
}
1.6 +1 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemDecimalFormat.hpp 2001/02/12 02:34:51 1.5
+++ ElemDecimalFormat.hpp 2001/03/02 15:34:49 1.6
@@ -106,8 +106,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.22 +6 -8 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemElement.cpp 2001/02/13 16:49:12 1.21
+++ ElemElement.cpp 2001/03/02 15:34:51 1.22
@@ -149,8 +149,7 @@
void
ElemElement::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -259,9 +258,9 @@
}
}
- ElemUse::execute(executionContext, sourceTree, sourceNode, mode);
+ ElemUse::execute(executionContext, sourceNode, mode);
- doExecuteChildren(executionContext, sourceTree, sourceNode, mode,
isIllegalElement);
+ doExecuteChildren(executionContext, sourceNode, mode, isIllegalElement);
if (isIllegalElement == false)
{
@@ -273,8 +272,7 @@
void
ElemElement::doExecuteChildren(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode,
bool
skipAttributeChildren) const
@@ -283,7 +281,7 @@
{
// If we should execute all children, then just call
// executeChildren()...
- executeChildren(executionContext, sourceTree, sourceNode, mode);
+ executeChildren(executionContext, sourceNode, mode);
}
else
{
@@ -293,7 +291,7 @@
{
if (node->getXSLToken() !=
Constants::ELEMNAME_ATTRIBUTE)
{
- node->execute(executionContext, sourceTree,
sourceNode, mode);
+ node->execute(executionContext, sourceNode,
mode);
}
}
}
1.10 +4 -7 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemElement.hpp 2001/02/12 23:55:24 1.9
+++ ElemElement.hpp 2001/03/02 15:34:53 1.10
@@ -58,7 +58,7 @@
#define XALAN_ELEMELEMENT_HEADER_GUARD
/**
- * $Id: ElemElement.hpp,v 1.9 2001/02/12 23:55:24 dbertoni Exp $
+ * $Id: ElemElement.hpp,v 1.10 2001/03/02 15:34:53 auriemma Exp $
*
*
* $State: Exp $
@@ -110,8 +110,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
@@ -120,16 +119,14 @@
/**
* Process the children of a template.
*
- * @param executionContext The current execution context
- * @param sourceTree input source tree
+ * @param executionContext The current execution context
* @param sourceNode current context node
* @param mode current mode
* @param skipAttributeChildren If true, attribute children will not be
executed.
*/
virtual void
doExecuteChildren(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode,
bool
skipAttributeChildren) const;
1.6 +2 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemEmpty.cpp 2001/02/12 02:34:52 1.5
+++ ElemEmpty.cpp 2001/03/02 15:34:56 1.6
@@ -96,12 +96,11 @@
void
ElemEmpty::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
assert(false); // really shouldn't be executing empty nodes
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
}
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemEmpty.hpp 2001/02/12 02:34:52 1.6
+++ ElemEmpty.hpp 2001/03/02 15:34:58 1.7
@@ -101,8 +101,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
};
1.8 +2 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemExtensionCall.cpp 2001/02/12 02:34:52 1.7
+++ ElemExtensionCall.cpp 2001/03/02 15:34:59 1.8
@@ -97,8 +97,7 @@
void
ElemExtensionCall::execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -108,7 +107,7 @@
{
if(child->getXSLToken() == Constants::ELEMNAME_FALLBACK)
{
- child->execute(executionContext, sourceTree,
sourceNode, mode);
+ child->execute(executionContext, sourceNode, mode);
}
}
}
1.8 +1 -2 xml-xalan/c/src/XSLT/ElemExtensionCall.hpp
Index: ElemExtensionCall.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemExtensionCall.hpp 2001/02/12 02:34:52 1.7
+++ ElemExtensionCall.hpp 2001/03/02 15:35:01 1.8
@@ -106,8 +106,7 @@
virtual void
execute(
- StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
1.5 +1 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemFallback.cpp 2001/02/12 02:34:52 1.4
+++ ElemFallback.cpp 2001/03/02 15:35:03 1.5
@@ -128,7 +128,6 @@
void
ElemFallback::execute(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -147,11 +146,10 @@
if(extensionParent->elementAvailable(executionContext) == false)
{
- ElemTemplateElement::execute(executionContext,
sourceTree, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext,
sourceNode, mode);
executeChildren(
executionContext,
- sourceTree,
sourceNode,
mode);
}
1.4 +0 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemFallback.hpp 2001/02/12 02:34:52 1.3
+++ ElemFallback.hpp 2001/03/02 15:35:05 1.4
@@ -99,7 +99,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.9 +0 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemForEach.cpp 2001/02/12 02:34:52 1.8
+++ ElemForEach.cpp 2001/03/02 15:35:08 1.9
@@ -157,7 +157,6 @@
void
ElemForEach::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -170,7 +169,6 @@
getStylesheet(),
*this,
this,
- sourceTree,
sourceNode,
mode,
m_pSelectPattern,
1.8 +0 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemForEach.hpp 2001/02/12 02:34:52 1.7
+++ ElemForEach.hpp 2001/03/02 15:35:10 1.8
@@ -129,7 +129,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.11 +2 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemIf.cpp 2001/02/12 02:34:52 1.10
+++ ElemIf.cpp 2001/03/02 15:35:12 1.11
@@ -139,13 +139,12 @@
void
ElemIf::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
assert(m_test != 0);
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
const XObjectPtr test(m_test->execute(sourceNode, *this,
executionContext));
assert(test.null() == false);
@@ -163,6 +162,6 @@
if(test->boolean())
{
- executeChildren(executionContext, sourceTree, sourceNode, mode);
+ executeChildren(executionContext, sourceNode, mode);
}
}
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemIf.hpp 2001/02/12 02:34:52 1.6
+++ ElemIf.hpp 2001/03/02 15:35:14 1.7
@@ -58,7 +58,7 @@
#define XALAN_ELEMIF_HEADER_GUARD
/**
- * $Id: ElemIf.hpp,v 1.6 2001/02/12 02:34:52 dbertoni Exp $
+ * $Id: ElemIf.hpp,v 1.7 2001/03/02 15:35:14 auriemma Exp $
*
* $State: Exp $
*
@@ -107,7 +107,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.31 +2 -3 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ElemLiteralResult.cpp 2001/02/12 23:55:24 1.30
+++ ElemLiteralResult.cpp 2001/03/02 15:35:17 1.31
@@ -196,13 +196,12 @@
void
ElemLiteralResult::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
executionContext.startElement(c_wstr(getElementName()));
- ElemUse::execute(executionContext, sourceTree, sourceNode, mode);
+ ElemUse::execute(executionContext, sourceNode, mode);
m_namespacesHandler.outputResultNamespaces(executionContext);
@@ -246,7 +245,7 @@
}
}
- executeChildren(executionContext, sourceTree, sourceNode, mode);
+ executeChildren(executionContext, sourceNode, mode);
executionContext.endElement(c_wstr(getElementName()));
}
1.16 +0 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemLiteralResult.hpp 2001/02/12 23:55:24 1.15
+++ ElemLiteralResult.hpp 2001/03/02 15:35:19 1.16
@@ -121,7 +121,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.8 +1 -3 xml-xalan/c/src/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemMessage.cpp 2001/02/12 02:34:52 1.7
+++ ElemMessage.cpp 2001/03/02 15:35:22 1.8
@@ -125,17 +125,15 @@
void
ElemMessage::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
StylesheetExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
childrenToString(
executionContext,
- sourceTree,
sourceNode,
mode,
theResult.get());
1.8 +0 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemMessage.hpp 2001/02/12 02:34:52 1.7
+++ ElemMessage.hpp 2001/03/02 15:35:25 1.8
@@ -99,7 +99,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.40 +2 -4 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ElemNumber.cpp 2001/02/12 02:34:52 1.39
+++ ElemNumber.cpp 2001/03/02 15:35:27 1.40
@@ -215,14 +215,13 @@
void
ElemNumber::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
const XalanDOMString countString =
- getCountString(executionContext, sourceTree, sourceNode);
+ getCountString(executionContext, sourceNode);
if (!isEmpty(countString))
{
@@ -379,7 +378,6 @@
XalanDOMString
ElemNumber::getCountString(
StylesheetExecutionContext&
executionContext,
- XalanNode*
/* sourceTree */,
XalanNode*
sourceNode) const
{
assert(sourceNode != 0);
1.26 +1 -3 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemNumber.hpp 2001/02/12 02:34:52 1.25
+++ ElemNumber.hpp 2001/03/02 15:35:31 1.26
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.25 2001/02/12 02:34:52 dbertoni Exp $
+ * $Id: ElemNumber.hpp,v 1.26 2001/03/02 15:35:31 auriemma Exp $
*
* $State: Exp $
*
@@ -152,7 +152,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
@@ -221,7 +220,6 @@
XalanDOMString
getCountString(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode) const;
/**
1.10 +1 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemParam.cpp 2001/02/12 02:34:53 1.9
+++ ElemParam.cpp 2001/03/02 15:35:35 1.10
@@ -98,7 +98,6 @@
void
ElemParam::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -106,7 +105,7 @@
if (obj.null() == true)
{
- ElemVariable::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemVariable::execute(executionContext, sourceNode, mode);
}
else
{
@@ -115,7 +114,6 @@
executionContext.fireTraceEvent(
TracerEvent(
executionContext,
- sourceTree,
sourceNode,
mode,
*this));
1.7 +0 -1 xml-xalan/c/src/XSLT/ElemParam.hpp
Index: ElemParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemParam.hpp 2001/02/12 02:34:53 1.6
+++ ElemParam.hpp 2001/03/02 15:35:37 1.7
@@ -97,7 +97,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
};
1.10 +1 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemPI.cpp 2001/03/02 12:08:27 1.9
+++ ElemPI.cpp 2001/03/02 15:35:40 1.10
@@ -132,11 +132,10 @@
void
ElemPI::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
XalanDOMString piName;
@@ -155,7 +154,6 @@
childrenToString(
executionContext,
- sourceTree,
sourceNode,
mode,
theResult.get());
1.9 +0 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemPI.hpp 2001/03/01 19:13:46 1.8
+++ ElemPI.hpp 2001/03/02 15:35:42 1.9
@@ -105,7 +105,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.12 +2 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemTemplate.cpp 2001/02/12 02:34:53 1.11
+++ ElemTemplate.cpp 2001/03/02 15:35:44 1.12
@@ -161,11 +161,10 @@
void
ElemTemplate::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
- executeChildren(executionContext, sourceTree, sourceNode, mode);
+ executeChildren(executionContext, sourceNode, mode);
}
1.9 +0 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemTemplate.hpp 2001/02/12 02:34:53 1.8
+++ ElemTemplate.hpp 2001/03/02 15:35:47 1.9
@@ -153,7 +153,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.47 +5 -22 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ElemTemplateElement.cpp 2001/02/27 22:00:07 1.46
+++ ElemTemplateElement.cpp 2001/03/02 15:35:50 1.47
@@ -262,14 +262,13 @@
void
ElemTemplateElement::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(
- TracerEvent(executionContext, sourceTree, sourceNode,
mode, *this));
+ TracerEvent(executionContext, sourceNode, mode, *this));
}
}
@@ -278,7 +277,6 @@
void
ElemTemplateElement::executeChildren(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -286,7 +284,7 @@
for (ElemTemplateElement* node = m_firstChild; node != 0; node =
node->m_nextSibling)
{
- node->execute(executionContext, sourceTree, sourceNode, mode);
+ node->execute(executionContext, sourceNode, mode);
}
}
@@ -295,7 +293,6 @@
void
ElemTemplateElement::childrenToString(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
XalanDOMString& result)
const
@@ -315,7 +312,7 @@
executionContext,
&theFormatter);
- executeChildren(executionContext, sourceTree, sourceNode, mode);
+ executeChildren(executionContext, sourceNode, mode);
}
@@ -546,7 +543,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement& xslInstruction,
const ElemTemplateElement* theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName& mode,
const XPath*
selectPattern,
@@ -695,7 +691,6 @@
stylesheetTree,
xslInstruction,
theTemplate,
- sourceTree,
sourceNodeContext,
mode,
xslToken,
@@ -720,7 +715,6 @@
stylesheetTree,
xslInstruction,
theTemplate,
- sourceTree,
sourceNodeContext,
mode,
xslToken,
@@ -740,7 +734,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName&
mode,
int
xslToken,
@@ -778,7 +771,6 @@
stylesheetTree,
xslInstruction,
theTemplate,
- sourceTree,
sourceNodeContext,
mode,
xslToken,
@@ -792,7 +784,6 @@
stylesheetTree,
xslInstruction,
theTemplate,
- sourceTree,
sourceNodeContext,
mode,
xslToken,
@@ -809,7 +800,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName&
mode,
int
xslToken,
@@ -829,7 +819,6 @@
stylesheetTree,
xslInstruction,
theTemplate,
- sourceTree,
sourceNodeContext,
mode,
xslToken,
@@ -847,7 +836,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName&
mode,
int
xslToken,
@@ -883,7 +871,6 @@
stylesheetTree,
&xslInstruction,
theTemplate,
- sourceTree,
sourceNodeContext,
childNode,
mode,
@@ -899,7 +886,6 @@
const Stylesheet&
stylesheet_tree,
const ElemTemplateElement* /* xslInstruction */,
const ElemTemplateElement* theTemplate,
- XalanNode*
sourceTree,
XalanNode*
selectContext,
XalanNode* child,
const QName& mode,
@@ -921,7 +907,6 @@
theTemplate = stylesheetTree->findTemplate(
executionContext,
- sourceTree,
child,
mode,
isApplyImports,
@@ -954,7 +939,7 @@
if(0 != theTemplate)
{
- executionContext.resetCurrentState(sourceTree, child);
+ executionContext.resetCurrentState(child);
if(theTemplate ==
getStylesheet().getStylesheetRoot().getDefaultTextRule())
{
@@ -993,7 +978,6 @@
if(0 != executionContext.getTraceListeners())
{
TracerEvent te(executionContext,
- sourceTree,
child,
mode,
*theTemplate);
@@ -1002,12 +986,11 @@
}
theTemplate->executeChildren(executionContext,
-
sourceTree,
child,
mode);
}
- executionContext.resetCurrentState(sourceTree, selectContext);
+ executionContext.resetCurrentState(selectContext);
}
return true;
1.24 +0 -15 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ElemTemplateElement.hpp 2001/02/12 23:55:26 1.23
+++ ElemTemplateElement.hpp 2001/03/02 15:35:53 1.24
@@ -198,14 +198,12 @@
* recursively execute down the element tree.
*
* @param executionContext The current execution context
- * @param sourceTree input source tree
* @param sourceNode current context node
* @param mode current mode
*/
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
@@ -213,14 +211,12 @@
* Process the children of a template.
*
* @param processor XSLT processor instance
- * @param sourceTree input source tree
* @param sourceNode current context node
* @param mode current mode
*/
void
executeChildren(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
@@ -229,7 +225,6 @@
* convert it to a string.
*
* @param executionContext The current execution context
- * @param sourceTree primary source tree
* @param sourceNode current source node context
* @param mode current mode
* @param result result of executing the elements children
@@ -237,7 +232,6 @@
void
childrenToString(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
XalanDOMString& result)
const;
@@ -656,7 +650,6 @@
* @param xslInstruction The stylesheet element context (deprecated --
I do
* not think we need this).
* @param template The owning template context.
- * @param sourceTree The input source tree.
* @param sourceNodeContext The current source node context.
* @param mode The current mode.
* @param selectPattern The XPath with which to perform the selection.
@@ -671,7 +664,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement& xslInstruction,
const ElemTemplateElement* theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName& mode,
const XPath*
selectPattern,
@@ -686,7 +678,6 @@
* @param xslInstruction The stylesheet element context (deprecated --
I do
* not think we need this).
* @param template The owning template context.
- * @param sourceTree The input source tree.
* @param sourceNodeContext The current source node context.
* @param mode The current mode.
* @param selectPattern The XPath with which to perform the selection.
@@ -701,7 +692,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName&
mode,
int
xslToken,
@@ -718,7 +708,6 @@
* @param xslInstruction The stylesheet element context (deprecated --
I do
* not think we need this).
* @param template The owning template context.
- * @param sourceTree The input source tree.
* @param sourceNodeContext The current source node context.
* @param mode The current mode.
* @param selectPattern The XPath with which to perform the selection.
@@ -733,7 +722,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName&
mode,
int
xslToken,
@@ -748,7 +736,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
- XalanNode*
sourceTree,
XalanNode*
sourceNodeContext,
const QName&
mode,
int
xslToken,
@@ -764,7 +751,6 @@
* @param xslInstruction The calling element (deprecated -- I dont
think we
* need this).
* @param template The template to use if xsl:for-each, or null.
- * @param sourceTree The source DOM tree.
* @param selectContext The selection context.
* @param child The source context node.
* @param mode The current mode, may be null.
@@ -778,7 +764,6 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement* xslInstruction,
const ElemTemplateElement* theTemplate,
- XalanNode*
sourceTree,
XalanNode*
selectContext,
XalanNode*
child,
const QName& mode,
1.10 +1 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemTextLiteral.cpp 2001/02/12 02:34:53 1.9
+++ ElemTextLiteral.cpp 2001/03/02 15:35:56 1.10
@@ -114,11 +114,10 @@
void
ElemTextLiteral::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
if(!m_disableOutputEscaping)
{
1.8 +0 -1 xml-xalan/c/src/XSLT/ElemTextLiteral.hpp
Index: ElemTextLiteral.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemTextLiteral.hpp 2001/02/12 02:34:53 1.7
+++ ElemTextLiteral.hpp 2001/03/02 15:35:58 1.8
@@ -136,7 +136,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.9 +2 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemUse.cpp 2001/02/12 02:34:53 1.8
+++ ElemUse.cpp 2001/03/02 15:36:01 1.9
@@ -114,15 +114,14 @@
void
ElemUse::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
if(0 != m_attributeSetsNames.size())
getStylesheet().getStylesheetRoot().applyAttrSets(m_attributeSetsNames,
- executionContext, sourceTree, sourceNode, mode);
+ executionContext, sourceNode, mode);
}
1.9 +0 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemUse.hpp 2001/02/12 02:34:53 1.8
+++ ElemUse.hpp 2001/03/02 15:36:03 1.9
@@ -126,7 +126,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.20 +1 -2 xml-xalan/c/src/XSLT/ElemValueOf.cpp
Index: ElemValueOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemValueOf.cpp 2001/02/27 19:57:49 1.19
+++ ElemValueOf.cpp 2001/03/02 15:36:08 1.20
@@ -167,11 +167,10 @@
void
ElemValueOf::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
if (m_isDot == true)
{
1.10 +0 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemValueOf.hpp 2001/02/12 02:34:53 1.9
+++ ElemValueOf.hpp 2001/03/02 15:36:10 1.10
@@ -105,7 +105,6 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemVariable.cpp 2001/02/12 02:34:53 1.12
+++ ElemVariable.cpp 2001/03/02 15:36:11 1.13
@@ -155,13 +155,12 @@
void
ElemVariable::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const
{
- ElemTemplateElement::execute(executionContext, sourceTree, sourceNode,
mode);
+ ElemTemplateElement::execute(executionContext, sourceNode, mode);
- const XObjectPtr theValue(getValue(executionContext, sourceTree,
sourceNode));
+ const XObjectPtr theValue(getValue(executionContext,
sourceNode));
if (theValue.null() == false)
{
@@ -184,12 +183,11 @@
const XObjectPtr
ElemVariable::getValue(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode) const
{
if(m_selectPattern == 0)
{
- return executionContext.createXResultTreeFrag(*this,
sourceTree, sourceNode);
+ return executionContext.createXResultTreeFrag(*this,
sourceNode);
}
else
{
1.12 +1 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemVariable.hpp 2001/02/12 02:34:53 1.11
+++ ElemVariable.hpp 2001/03/02 15:36:14 1.12
@@ -58,7 +58,7 @@
#define XALAN_ELEMVARIABLE_HEADER_GUARD
/**
- * $Id: ElemVariable.hpp,v 1.11 2001/02/12 02:34:53 dbertoni Exp $
+ * $Id: ElemVariable.hpp,v 1.12 2001/03/02 15:36:14 auriemma Exp $
*
* $State: Exp $
*
@@ -148,14 +148,12 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
const;
const XObjectPtr
getValue(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceTree,
XalanNode*
sourceNode) const;
protected:
1.49 +4 -9 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Stylesheet.cpp 2001/02/13 23:52:43 1.48
+++ Stylesheet.cpp 2001/03/02 15:36:17 1.49
@@ -631,12 +631,11 @@
const ElemTemplate*
Stylesheet::findTemplate(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
XalanNode*
targetNode) const
{
const Stylesheet* theDummy;
- return findTemplate(executionContext, sourceTree, targetNode,
QNameByReference(), false, theDummy);
+ return findTemplate(executionContext, targetNode, QNameByReference(),
false, theDummy);
}
@@ -705,13 +704,11 @@
const ElemTemplate*
Stylesheet::findTemplate(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
XalanNode*
targetNode,
const QName& mode,
bool
useImports,
const Stylesheet*&
foundStylesheet) const
{
- assert(sourceTree != 0);
assert(targetNode != 0);
assert(m_patternCount == m_patternTable.size());
@@ -930,7 +927,6 @@
m_imports[i];
bestMatchedRule =
stylesheet->findTemplate(executionContext,
-
sourceTree,
targetNode,
mode,
false,
@@ -1467,8 +1463,7 @@
void
Stylesheet::applyAttrSets(
const QNameVectorType&
attributeSetsNames,
- StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext& executionContext,
XalanNode*
sourceNode,
const QName& mode)
const
{
@@ -1485,7 +1480,7 @@
const Stylesheet* const stylesheet =
m_imports[i];
stylesheet->applyAttrSets(attributeSetsNames,
-
executionContext, sourceTree, sourceNode, mode);
+
executionContext, sourceNode, mode);
}
for(QNameVectorType::size_type j = 0; j < nNames; j++)
@@ -1500,7 +1495,7 @@
if(qname.equals(attrSet->getQName()))
{
- attrSet->execute(executionContext,
sourceTree, sourceNode, mode);
+ attrSet->execute(executionContext,
sourceNode, mode);
}
}
}
1.32 +1 -7 xml-xalan/c/src/XSLT/Stylesheet.hpp
Index: Stylesheet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.hpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Stylesheet.hpp 2001/01/31 01:42:20 1.31
+++ Stylesheet.hpp 2001/03/02 15:36:20 1.32
@@ -534,15 +534,13 @@
*
* @param attributeSetsNames list of attribute set names
* @param executionContext current execution context
- * @param sourceTree node for source tree
* @param sourceNode source node
* @param mode execution mode
*/
void
applyAttrSets(
const QNameVectorType&
attributeSetsNames,
- StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
+ StylesheetExecutionContext& executionContext,
XalanNode*
sourceNode,
const QName& mode)
const;
@@ -680,14 +678,12 @@
* XSL document, according to the rules specified in the xsl draft.
*
* @param executionContext current execution context
- * @param sourceTree where the targetElem is to be found
* @param targetNode element that needs a rule
* @return pointer to rule that best
matches targetNode
*/
const ElemTemplate*
findTemplate(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
XalanNode*
targetNode) const;
/**
@@ -695,7 +691,6 @@
* XSL document, according to the rules specified in the xsl draft.
*
* @param executionContext current execution context
- * @param sourceTree where the targetElem is to be found
* @param targetElem element that needs a rule
* @param mode string indicating the display mode
* @param useImports means that this is an xsl:apply-imports
commend
@@ -704,7 +699,6 @@
const ElemTemplate*
findTemplate(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceTree,
XalanNode*
targetNode,
const QName& mode,
bool
useImports,
1.5 +0 -2 xml-xalan/c/src/XSLT/StylesheetExecutionContext.cpp
Index: StylesheetExecutionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StylesheetExecutionContext.cpp 2000/07/21 19:52:56 1.4
+++ StylesheetExecutionContext.cpp 2001/03/02 15:36:23 1.5
@@ -80,7 +80,6 @@
StylesheetExecutionContext&
executionContext,
const ElemTemplateElement* /*
contextElement */,
const ElemTemplateElement&
xslCallTemplateElement,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
const ElemTemplateElement* targetTemplate)
:
@@ -93,7 +92,6 @@
executionContext.pushParams(
xslCallTemplateElement,
- sourceTree,
sourceNode,
mode,
targetTemplate);
1.48 +0 -13 xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- StylesheetExecutionContext.hpp 2001/03/01 19:13:47 1.47
+++ StylesheetExecutionContext.hpp 2001/03/02 15:36:26 1.48
@@ -211,12 +211,10 @@
/**
* Reset the state of execution to node 'xmlNode' in source tree
'sourceTree.'
*
- * @param sourceTree source tree for execution
* @param xmlNode node to execute
*/
virtual void
resetCurrentState(
- XalanNode* sourceTree,
XalanNode* xmlNode) = 0;
/**
@@ -514,7 +512,6 @@
* @param name name of variable
* @param element element marker for variable
* @param templateChild result tree fragment to use.
- * @param sourceTree node for source tree
* @param sourceNode source node
* @return a pointer to the XObject result
*/
@@ -522,7 +519,6 @@
createVariable(
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode) = 0;
@@ -572,7 +568,6 @@
* @param name name of variable
* @param element element marker for variable
* @param templateChild result tree fragment to use.
- * @param sourceTree node for source tree
* @param sourceNode source node
*/
virtual void
@@ -580,7 +575,6 @@
const QName& name,
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode) = 0;
/**
@@ -641,7 +635,6 @@
* Also, push default arguments on the stack.
*
* @param xslCallTemplateElement "call-template" element
- * @param sourceTree source tree
* @param sourceNode source node
* @param mode mode under which the template is
operating
* @param targetTemplate target template
@@ -649,7 +642,6 @@
virtual void
pushParams(
const ElemTemplateElement& xslCallTemplateElement,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
const ElemTemplateElement* targetTemplate) = 0;
@@ -772,7 +764,6 @@
StylesheetExecutionContext&
executionContext,
const ElemTemplateElement* contextElement,
const ElemTemplateElement&
xslCallTemplateElement,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
const ElemTemplateElement* targetTemplate);
@@ -952,21 +943,18 @@
* Create an XObject that represents a Result tree fragment.
*
* @param templateChild result tree fragment to use.
- * @param sourceTree node for source tree
* @param sourceNode source node
* @return XObject instance
*/
virtual const XObjectPtr
createXResultTreeFrag(
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode) = 0;
/**
* Create an XObject that represents a Result tree fragment.
*
* @param templateChild result tree fragment to use.
- * @param sourceTree node for source tree
* @param sourceNode source node
* @param mode current mode
* @return XObject instance
@@ -974,7 +962,6 @@
virtual const XObjectPtr
createXResultTreeFrag(
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode) = 0;
1.56 +5 -13
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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- StylesheetExecutionContextDefault.cpp 2001/03/01 19:13:48 1.55
+++ StylesheetExecutionContextDefault.cpp 2001/03/02 15:36:29 1.56
@@ -215,10 +215,9 @@
void
StylesheetExecutionContextDefault::resetCurrentState(
- XalanNode* sourceTree,
XalanNode* xmlNode)
{
- m_xsltProcessor.resetCurrentState(sourceTree, xmlNode);
+ m_xsltProcessor.resetCurrentState(xmlNode);
}
@@ -466,11 +465,10 @@
StylesheetExecutionContextDefault::createVariable(
const ElemTemplateElement* /* element */,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
{
- return createXResultTreeFrag(templateChild, sourceTree, sourceNode,
mode);
+ return createXResultTreeFrag(templateChild, sourceNode, mode);
}
@@ -538,10 +536,9 @@
const QName& name,
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode)
{
- m_variablesStack.pushVariable(name,
createXResultTreeFrag(templateChild, sourceTree, sourceNode), element);
+ m_variablesStack.pushVariable(name,
createXResultTreeFrag(templateChild, sourceNode), element);
}
@@ -607,7 +604,6 @@
void
StylesheetExecutionContextDefault::pushParams(
const ElemTemplateElement& xslCallTemplateElement,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
const ElemTemplateElement* targetTemplate)
@@ -665,7 +661,6 @@
createVariable(
&xslCallTemplateElement,
*xslParamElement,
- sourceTree,
sourceNode,
mode);
}
@@ -834,11 +829,9 @@
const XObjectPtr
StylesheetExecutionContextDefault::createXResultTreeFrag(
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode)
{
return createXResultTreeFrag(templateChild,
- sourceTree,
sourceNode,
QNameByReference());
}
@@ -848,7 +841,6 @@
const XObjectPtr
StylesheetExecutionContextDefault::createXResultTreeFrag(
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode)
{
@@ -869,7 +861,7 @@
*this,
&tempFormatter);
- templateChild.executeChildren(*this, sourceTree, sourceNode,
mode);
+ templateChild.executeChildren(*this, sourceNode, mode);
}
else
{
@@ -885,7 +877,7 @@
*this,
&tempFormatter);
- templateChild.executeChildren(*this, sourceTree, sourceNode,
mode);
+ templateChild.executeChildren(*this, sourceNode, mode);
}
return getXObjectFactory().createResultTreeFrag(theResultTreeFrag);
1.50 +0 -6
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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- StylesheetExecutionContextDefault.hpp 2001/03/01 19:13:49 1.49
+++ StylesheetExecutionContextDefault.hpp 2001/03/02 15:36:33 1.50
@@ -227,7 +227,6 @@
virtual void
resetCurrentState(
- XalanNode* sourceTree,
XalanNode* xmlNode);
virtual bool
@@ -317,7 +316,6 @@
createVariable(
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode);
@@ -354,7 +352,6 @@
const QName& name,
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode);
virtual void
@@ -372,7 +369,6 @@
virtual void
pushParams(
const ElemTemplateElement& xslCallTemplateElement,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode,
const ElemTemplateElement* targetTemplate);
@@ -437,13 +433,11 @@
virtual const XObjectPtr
createXResultTreeFrag(
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode);
virtual const XObjectPtr
createXResultTreeFrag(
const ElemTemplateElement& templateChild,
- XalanNode*
sourceTree,
XalanNode*
sourceNode,
const QName& mode);
1.37 +3 -3 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- StylesheetRoot.cpp 2001/02/14 00:11:16 1.36
+++ StylesheetRoot.cpp 2001/03/02 15:36:36 1.37
@@ -185,7 +185,7 @@
{
// Find the root pattern in the XSL.
const ElemTemplate* rootRule =
- findTemplate(executionContext, sourceTree, sourceTree);
+ findTemplate(executionContext, sourceTree);
if(0 == rootRule)
{
@@ -197,7 +197,7 @@
setupFormatterListener(outputTarget, executionContext);
- executionContext.resetCurrentState(sourceTree, sourceTree);
+ executionContext.resetCurrentState(sourceTree);
executionContext.setRootDocument(sourceTree);
@@ -226,7 +226,7 @@
// Output the action of the found root rule. All processing
// occurs from here.
- rootRule->execute(executionContext, sourceTree, sourceTree,
QNameByReference());
+ rootRule->execute(executionContext, sourceTree, QNameByReference());
// At this point, anything transient during the tranformation
// may have been deleted, so we may not refer to anything the
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TracerEvent.cpp 2000/08/22 20:21:30 1.4
+++ TracerEvent.cpp 2001/03/02 15:36:39 1.5
@@ -70,12 +70,10 @@
TracerEvent::TracerEvent(
const StylesheetExecutionContext&
executionContext,
- const XalanNode*
sourceTree,
const XalanNode*
sourceNode,
const QName&
mode,
const ElemTemplateElement&
styleNode) :
m_executionContext(executionContext),
- m_sourceTree(sourceTree),
m_sourceNode(sourceNode),
m_mode(mode),
m_styleNode(styleNode)
1.5 +0 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TracerEvent.hpp 2000/04/11 15:09:30 1.4
+++ TracerEvent.hpp 2001/03/02 15:36:41 1.5
@@ -89,14 +89,12 @@
* Construct a tracer event.
*
* @param executionContext XSLT processor instance
- * @param sourceTree input source tree
* @param sourceNode current context node
* @param mode current mode
* @param styleNode node in the style tree where the event
occurs
*/
TracerEvent(
const StylesheetExecutionContext&
executionContext,
- const XalanNode*
sourceTree,
const XalanNode*
sourceNode,
const QName&
mode,
const ElemTemplateElement&
styleNode);
@@ -133,11 +131,6 @@
*/
const StylesheetExecutionContext& m_executionContext;
- /**
- * The input source tree.
- */
- const XalanNode*
m_sourceTree;
-
/**
* The current context node.
*/
1.13 +1 -1 xml-xalan/c/src/XSLT/VariablesStack.cpp
Index: VariablesStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/VariablesStack.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VariablesStack.cpp 2001/02/04 05:43:35 1.12
+++ VariablesStack.cpp 2001/03/02 15:36:43 1.13
@@ -427,7 +427,7 @@
SetAndRestoreForceGlobalSearch theGuard(*this);
- theNewValue = var->getValue(executionContext,
doc, doc);
+ theNewValue = var->getValue(executionContext,
doc);
assert(theNewValue.null() == false);
theEntry->setValue(theNewValue);
1.91 +0 -1 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- XSLTEngineImpl.cpp 2001/03/01 19:13:50 1.90
+++ XSLTEngineImpl.cpp 2001/03/02 15:36:45 1.91
@@ -2811,7 +2811,6 @@
void
XSLTEngineImpl::resetCurrentState(
- XalanNode* /* sourceTree */,
XalanNode* xmlNode)
{
if(0 != xmlNode)
1.63 +1 -3 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- XSLTEngineImpl.hpp 2001/03/01 19:13:51 1.62
+++ XSLTEngineImpl.hpp 2001/03/02 15:36:49 1.63
@@ -256,9 +256,7 @@
const XObject& xobj);
virtual void
- resetCurrentState(
- XalanNode* sourceTree,
- XalanNode* xmlNode);
+ resetCurrentState(XalanNode* xmlNode);
virtual void
resolveTopLevelParams(StylesheetExecutionContext&
executionContext);
1.20 +0 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XSLTProcessor.hpp 2001/03/01 19:13:52 1.19
+++ XSLTProcessor.hpp 2001/03/02 15:36:52 1.20
@@ -222,12 +222,10 @@
* Reset the state of execution to node 'xmlNode' in source tree
* 'sourceTree.'
*
- * @param sourceTree source tree for execution
* @param xmlNode node to execute
*/
virtual void
resetCurrentState(
- XalanNode* sourceTree,
XalanNode* xmlNode) = 0;
/**
