auriemma 01/03/06 13:23:47
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 SelectionEvent.cpp Stylesheet.cpp
Stylesheet.hpp StylesheetExecutionContext.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetRoot.cpp TracerEvent.cpp TracerEvent.hpp
Log:
Added mode to the execution context and removed mode parameter from several
functions.
Revision Changes Path
1.9 +3 -6 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemApplyImport.cpp 2001/03/02 15:34:06 1.8
+++ ElemApplyImport.cpp 2001/03/06 21:22:07 1.9
@@ -118,10 +118,9 @@
void
ElemApplyImport::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
// This will have to change to current template, (which will have
// to be the top of a current template stack).
@@ -133,9 +132,7 @@
0,
DOMServices::getParentOfNode(*sourceNode),
sourceNode,
- mode,
- getXSLToken());
-
+ getXSLToken());
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemApplyImport.hpp 2001/03/02 15:34:11 1.7
+++ ElemApplyImport.hpp 2001/03/06 21:22:08 1.8
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYIMPORT_HEADER_GUARD
/**
- * $Id: ElemApplyImport.hpp,v 1.7 2001/03/02 15:34:11 auriemma Exp $
+ * $Id: ElemApplyImport.hpp,v 1.8 2001/03/06 21:22:08 auriemma Exp $
*
* $State: Exp $
*
@@ -106,8 +106,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
virtual ElemTemplateElement*
appendChildElem(ElemTemplateElement* newChild);
1.13 +21 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemApplyTemplates.cpp 2001/03/02 15:34:14 1.12
+++ ElemApplyTemplates.cpp 2001/03/06 21:22:08 1.13
@@ -124,6 +124,12 @@
+ElemApplyTemplates::~ElemApplyTemplates()
+{
+}
+
+
+
const XalanDOMString&
ElemApplyTemplates::getElementName() const
{
@@ -135,13 +141,12 @@
void
ElemApplyTemplates::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(TracerEvent(
- executionContext, sourceNode, mode, *this));
+ executionContext, sourceNode, *this));
}
if (0 != sourceNode)
{
@@ -154,21 +159,29 @@
this,
*this,
sourceNode,
- mode,
this);
+
+ // Initialize the member mode of execution context.
+ if (executionContext.getCurrentMode() == 0)
+ executionContext.setCurrentMode(&m_mode);
- if (m_isDefaultTemplate == false)
+ if (m_isDefaultTemplate == false &&
+ !m_mode.equals(*executionContext.getCurrentMode()))
{
+ const QName* oldMode =
executionContext.getCurrentMode();
+ executionContext.setCurrentMode(&m_mode);
+
transformSelectedChildren(
executionContext,
getStylesheet(),
*this,
0,
- sourceNode,
- m_mode,
+ sourceNode,
m_pSelectPattern,
Constants::ELEMNAME_APPLY_TEMPLATES,
thePushPop.getStackFrameIndex());
+
+ executionContext.setCurrentMode(oldMode);
}
else
{
@@ -177,8 +190,7 @@
getStylesheet(),
*this,
0,
- sourceNode,
- mode,
+ sourceNode,
m_pSelectPattern,
Constants::ELEMNAME_APPLY_TEMPLATES,
thePushPop.getStackFrameIndex());
1.9 +5 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemApplyTemplates.hpp 2001/03/02 15:34:17 1.8
+++ ElemApplyTemplates.hpp 2001/03/06 21:22:09 1.9
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD
/**
- * $Id: ElemApplyTemplates.hpp,v 1.8 2001/03/02 15:34:17 auriemma Exp $
+ * $Id: ElemApplyTemplates.hpp,v 1.9 2001/03/06 21:22:09 auriemma Exp $
*
* $State: Exp $
*
@@ -99,6 +99,9 @@
int
lineNumber,
int
columnNumber);
+ virtual
+ ~ElemApplyTemplates();
+
/**
* Determines whether this is the default template
*
@@ -129,8 +132,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.21 +2 -4 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemAttribute.cpp 2001/03/02 15:34:20 1.20
+++ ElemAttribute.cpp 2001/03/06 21:22:09 1.21
@@ -156,12 +156,11 @@
void
ElemAttribute::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
assert(m_pNameAVT != 0);
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
StylesheetExecutionContext::GetAndReleaseCachedString
attrNameGuard(executionContext);
@@ -347,7 +346,6 @@
childrenToString(
executionContext,
sourceNode,
- mode,
theResult.get());
executionContext.addResultAttribute(attrName,
theResult.get());
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemAttribute.hpp 2001/03/02 15:34:22 1.7
+++ ElemAttribute.hpp 2001/03/06 21:22:10 1.8
@@ -58,7 +58,7 @@
#define XALAN_ELEMATTRIBUTE_HEADER_GUARD
/**
- * $Id: ElemAttribute.hpp,v 1.7 2001/03/02 15:34:22 auriemma Exp $
+ * $Id: ElemAttribute.hpp,v 1.8 2001/03/06 21:22:10 auriemma Exp $
*
*
* $State: Exp $
@@ -111,8 +111,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemAttributeSet.cpp 2001/03/02 15:34:25 1.8
+++ ElemAttributeSet.cpp 2001/03/06 21:22:11 1.9
@@ -127,19 +127,18 @@
void
ElemAttributeSet::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
// This will push and pop the stack automatically...
StylesheetExecutionContext::ElementRecursionStackPusher
thePusher(executionContext, this);
- ElemUse::execute(executionContext, sourceNode, mode);
+ ElemUse::execute(executionContext, sourceNode);
const ElemTemplateElement* attr = getFirstChildElem();
while(0 != attr)
{
- attr->execute(executionContext, sourceNode, mode);
+ attr->execute(executionContext, sourceNode);
attr = attr->getNextSiblingElem();
}
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemAttributeSet.hpp 2001/03/02 15:34:26 1.8
+++ ElemAttributeSet.hpp 2001/03/06 21:22:12 1.9
@@ -115,8 +115,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.14 +3 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemCallTemplate.cpp 2001/03/02 15:34:28 1.13
+++ ElemCallTemplate.cpp 2001/03/06 21:22:13 1.14
@@ -130,10 +130,9 @@
void
ElemCallTemplate::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
assert(isEmpty(m_templateName.getLocalPart()) == false);
@@ -148,10 +147,9 @@
theTemplate,
*this,
sourceNode,
- mode,
theTemplate);
- theTemplate->execute(executionContext, sourceNode, mode);
+ theTemplate->execute(executionContext, sourceNode);
}
else
{
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemCallTemplate.hpp 2001/03/02 15:34:30 1.10
+++ ElemCallTemplate.hpp 2001/03/06 21:22:14 1.11
@@ -104,8 +104,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemChoose.cpp 2001/03/02 15:34:31 1.11
+++ ElemChoose.cpp 2001/03/06 21:22:14 1.12
@@ -116,10 +116,9 @@
void
ElemChoose::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
for (const ElemTemplateElement* node = getFirstChildElem();
node != 0;
@@ -155,7 +154,7 @@
if(test->boolean() == true)
{
- node->executeChildren(executionContext,
sourceNode, mode);
+ node->executeChildren(executionContext,
sourceNode);
break;
}
@@ -163,7 +162,7 @@
else
{
// xsl:otherwise
- node->executeChildren(executionContext, sourceNode,
mode);
+ node->executeChildren(executionContext, sourceNode);
}
}
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemChoose.hpp 2001/03/02 15:34:33 1.7
+++ ElemChoose.hpp 2001/03/06 21:22:16 1.8
@@ -101,8 +101,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemComment.cpp 2001/03/02 15:34:35 1.7
+++ ElemComment.cpp 2001/03/06 21:22:17 1.8
@@ -116,17 +116,15 @@
void
ElemComment::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
StylesheetExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
childrenToString(
executionContext,
sourceNode,
- mode,
theResult.get());
executionContext.comment(c_wstr(theResult.get()));
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemComment.hpp 2001/03/02 15:34:37 1.7
+++ ElemComment.hpp 2001/03/06 21:22:18 1.8
@@ -100,8 +100,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.12 +5 -11 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemCopy.cpp 2001/03/02 15:34:39 1.11
+++ ElemCopy.cpp 2001/03/06 21:22:19 1.12
@@ -115,8 +115,7 @@
void
ElemCopy::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
assert(sourceNode != 0);
@@ -136,14 +135,12 @@
ElemUse::execute(
executionContext,
- sourceNode,
- mode);
+ sourceNode);
executionContext.copyNamespaceAttributes(*sourceNode);
executeChildren(executionContext,
- sourceNode,
- mode);
+ sourceNode);
const XalanDOMString& s =
DOMServices::getNameOfNode(*sourceNode);
@@ -155,7 +152,6 @@
{
executionContext.fireTraceEvent(TracerEvent(executionContext,
sourceNode,
- mode,
*this));
}
}
@@ -166,15 +162,13 @@
{
executionContext.fireTraceEvent(TracerEvent(executionContext,
sourceNode,
- mode,
*this));
}
ElemUse::execute(
executionContext,
- sourceNode,
- mode);
+ sourceNode);
- executeChildren(executionContext, sourceNode, mode);
+ executeChildren(executionContext, sourceNode);
}
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemCopy.hpp 2001/03/02 15:34:41 1.7
+++ ElemCopy.hpp 2001/03/06 21:22:21 1.8
@@ -97,8 +97,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
};
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemCopyOf.cpp 2001/03/02 15:34:42 1.14
+++ ElemCopyOf.cpp 2001/03/06 21:22:21 1.15
@@ -121,10 +121,9 @@
void
ElemCopyOf::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
assert(m_pSelectPattern != 0);
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemCopyOf.hpp 2001/03/02 15:34:44 1.7
+++ ElemCopyOf.hpp 2001/03/06 21:22:22 1.8
@@ -58,7 +58,7 @@
#define XALAN_ELEMCOPYOF_HEADER_GUARD
/**
- * $Id: ElemCopyOf.hpp,v 1.7 2001/03/02 15:34:44 auriemma Exp $
+ * $Id: ElemCopyOf.hpp,v 1.8 2001/03/06 21:22:22 auriemma Exp $
*
*
* $State: Exp $
@@ -108,8 +108,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
private:
1.5 +3 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemDecimalFormat.cpp 2001/03/02 15:34:47 1.4
+++ ElemDecimalFormat.cpp 2001/03/06 21:22:23 1.5
@@ -283,9 +283,7 @@
void
ElemDecimalFormat::execute(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
-{
- // $$$ ToDo: Fix this!!!
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ XalanNode*
sourceNode) const
+{
+ ElemTemplateElement::execute(executionContext, sourceNode);
}
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemDecimalFormat.hpp 2001/03/02 15:34:49 1.6
+++ ElemDecimalFormat.hpp 2001/03/06 21:22:23 1.7
@@ -107,8 +107,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
const XalanDecimalFormatSymbols&
getDecimalFormatSymbols() const
1.23 +5 -7 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ElemElement.cpp 2001/03/02 15:34:51 1.22
+++ ElemElement.cpp 2001/03/06 21:22:24 1.23
@@ -150,8 +150,7 @@
void
ElemElement::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
StylesheetExecutionContext::GetAndReleaseCachedString
elemNameGuard(executionContext);
@@ -258,9 +257,9 @@
}
}
- ElemUse::execute(executionContext, sourceNode, mode);
+ ElemUse::execute(executionContext, sourceNode);
- doExecuteChildren(executionContext, sourceNode, mode, isIllegalElement);
+ doExecuteChildren(executionContext, sourceNode, isIllegalElement);
if (isIllegalElement == false)
{
@@ -274,14 +273,13 @@
ElemElement::doExecuteChildren(
StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
- const QName& mode,
bool
skipAttributeChildren) const
{
if (skipAttributeChildren == false)
{
// If we should execute all children, then just call
// executeChildren()...
- executeChildren(executionContext, sourceNode, mode);
+ executeChildren(executionContext, sourceNode);
}
else
{
@@ -291,7 +289,7 @@
{
if (node->getXSLToken() !=
Constants::ELEMNAME_ATTRIBUTE)
{
- node->execute(executionContext, sourceNode,
mode);
+ node->execute(executionContext, sourceNode);
}
}
}
1.11 +2 -5 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemElement.hpp 2001/03/02 15:34:53 1.10
+++ ElemElement.hpp 2001/03/06 21:22:25 1.11
@@ -58,7 +58,7 @@
#define XALAN_ELEMELEMENT_HEADER_GUARD
/**
- * $Id: ElemElement.hpp,v 1.10 2001/03/02 15:34:53 auriemma Exp $
+ * $Id: ElemElement.hpp,v 1.11 2001/03/06 21:22:25 auriemma Exp $
*
*
* $State: Exp $
@@ -111,8 +111,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
@@ -121,14 +120,12 @@
*
* @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*
sourceNode,
- const QName& mode,
bool
skipAttributeChildren) const;
private:
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemEmpty.cpp 2001/03/02 15:34:56 1.6
+++ ElemEmpty.cpp 2001/03/06 21:22:26 1.7
@@ -97,10 +97,9 @@
void
ElemEmpty::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
assert(false); // really shouldn't be executing empty nodes
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemEmpty.hpp 2001/03/02 15:34:58 1.7
+++ ElemEmpty.hpp 2001/03/06 21:22:26 1.8
@@ -102,8 +102,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
};
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemExtensionCall.cpp 2001/03/02 15:34:59 1.8
+++ ElemExtensionCall.cpp 2001/03/06 21:22:27 1.9
@@ -98,8 +98,7 @@
void
ElemExtensionCall::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
executionContext.warn("Xalan C++ does not yet handle extensions!");
@@ -107,7 +106,7 @@
{
if(child->getXSLToken() == Constants::ELEMNAME_FALLBACK)
{
- child->execute(executionContext, sourceNode, mode);
+ child->execute(executionContext, sourceNode);
}
}
}
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemExtensionCall.hpp 2001/03/02 15:35:01 1.8
+++ ElemExtensionCall.hpp 2001/03/06 21:22:29 1.9
@@ -107,8 +107,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
bool
elementAvailable(StylesheetExecutionContext& executionContext) const;
1.6 +3 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemFallback.cpp 2001/03/02 15:35:03 1.5
+++ ElemFallback.cpp 2001/03/06 21:22:30 1.6
@@ -128,8 +128,7 @@
void
ElemFallback::execute(
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
const ElemTemplateElement* const parent =
getParentNodeElem();
@@ -146,12 +145,11 @@
if(extensionParent->elementAvailable(executionContext) == false)
{
- ElemTemplateElement::execute(executionContext,
sourceNode, mode);
+ ElemTemplateElement::execute(executionContext,
sourceNode);
executeChildren(
executionContext,
- sourceNode,
- mode);
+ sourceNode);
}
}
else
1.5 +1 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemFallback.hpp 2001/03/02 15:35:05 1.4
+++ ElemFallback.hpp 2001/03/06 21:22:30 1.5
@@ -99,8 +99,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
private:
1.10 +1 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemForEach.cpp 2001/03/02 15:35:08 1.9
+++ ElemForEach.cpp 2001/03/06 21:22:31 1.10
@@ -157,8 +157,7 @@
void
ElemForEach::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
if (sourceNode != 0)
{
@@ -170,7 +169,6 @@
*this,
this,
sourceNode,
- mode,
m_pSelectPattern,
Constants::ELEMNAME_FOREACH,
executionContext.getCurrentStackFrameIndex());
1.9 +1 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemForEach.hpp 2001/03/02 15:35:10 1.8
+++ ElemForEach.hpp 2001/03/06 21:22:32 1.9
@@ -129,8 +129,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.12 +3 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemIf.cpp 2001/03/02 15:35:12 1.11
+++ ElemIf.cpp 2001/03/06 21:22:33 1.12
@@ -139,12 +139,11 @@
void
ElemIf::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
assert(m_test != 0);
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
const XObjectPtr test(m_test->execute(sourceNode, *this,
executionContext));
assert(test.null() == false);
@@ -162,6 +161,6 @@
if(test->boolean())
{
- executeChildren(executionContext, sourceNode, mode);
+ executeChildren(executionContext, sourceNode);
}
}
1.8 +2 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemIf.hpp 2001/03/02 15:35:14 1.7
+++ ElemIf.hpp 2001/03/06 21:22:34 1.8
@@ -58,7 +58,7 @@
#define XALAN_ELEMIF_HEADER_GUARD
/**
- * $Id: ElemIf.hpp,v 1.7 2001/03/02 15:35:14 auriemma Exp $
+ * $Id: ElemIf.hpp,v 1.8 2001/03/06 21:22:34 auriemma Exp $
*
* $State: Exp $
*
@@ -107,8 +107,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
private:
1.32 +3 -4 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ElemLiteralResult.cpp 2001/03/02 15:35:17 1.31
+++ ElemLiteralResult.cpp 2001/03/06 21:22:35 1.32
@@ -196,12 +196,11 @@
void
ElemLiteralResult::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
executionContext.startElement(c_wstr(getElementName()));
- ElemUse::execute(executionContext, sourceNode, mode);
+ ElemUse::execute(executionContext, sourceNode);
m_namespacesHandler.outputResultNamespaces(executionContext);
@@ -245,7 +244,7 @@
}
}
- executeChildren(executionContext, sourceNode, mode);
+ executeChildren(executionContext, sourceNode);
executionContext.endElement(c_wstr(getElementName()));
}
1.17 +1 -2 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ElemLiteralResult.hpp 2001/03/02 15:35:19 1.16
+++ ElemLiteralResult.hpp 2001/03/06 21:22:36 1.17
@@ -121,8 +121,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
#if defined(XALAN_NO_NAMESPACES)
typedef vector<const AVT*> AVTVectorType;
1.9 +2 -4 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemMessage.cpp 2001/03/02 15:35:22 1.8
+++ ElemMessage.cpp 2001/03/06 21:22:36 1.9
@@ -125,17 +125,15 @@
void
ElemMessage::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
StylesheetExecutionContext::GetAndReleaseCachedString
theResult(executionContext);
childrenToString(
executionContext,
sourceNode,
- mode,
theResult.get());
executionContext.message(theResult.get(), sourceNode, this);
1.9 +1 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemMessage.hpp 2001/03/02 15:35:25 1.8
+++ ElemMessage.hpp 2001/03/06 21:22:37 1.9
@@ -99,8 +99,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
class ElemMessageTerminateException : public XSLTProcessorException
{
1.41 +2 -3 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ElemNumber.cpp 2001/03/02 15:35:27 1.40
+++ ElemNumber.cpp 2001/03/06 21:22:38 1.41
@@ -215,10 +215,9 @@
void
ElemNumber::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
const XalanDOMString countString =
getCountString(executionContext, sourceNode);
1.27 +2 -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ElemNumber.hpp 2001/03/02 15:35:31 1.26
+++ ElemNumber.hpp 2001/03/06 21:22:39 1.27
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.26 2001/03/02 15:35:31 auriemma Exp $
+ * $Id: ElemNumber.hpp,v 1.27 2001/03/06 21:22:39 auriemma Exp $
*
* $State: Exp $
*
@@ -152,8 +152,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
/**
* Get the previous node to be counted.
1.11 +2 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemParam.cpp 2001/03/02 15:35:35 1.10
+++ ElemParam.cpp 2001/03/06 21:22:40 1.11
@@ -98,14 +98,13 @@
void
ElemParam::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
const XObjectPtr obj =
executionContext.getParamVariable(m_qname);
if (obj.null() == true)
{
- ElemVariable::execute(executionContext, sourceNode, mode);
+ ElemVariable::execute(executionContext, sourceNode);
}
else
{
@@ -115,7 +114,6 @@
TracerEvent(
executionContext,
sourceNode,
- mode,
*this));
}
}
1.8 +1 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemParam.hpp 2001/03/02 15:35:37 1.7
+++ ElemParam.hpp 2001/03/06 21:22:40 1.8
@@ -97,8 +97,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
};
1.12 +2 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemPI.cpp 2001/03/05 17:27:37 1.11
+++ ElemPI.cpp 2001/03/06 21:22:41 1.12
@@ -132,10 +132,9 @@
void
ElemPI::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
XalanDOMString piName;
@@ -155,7 +154,6 @@
childrenToString(
executionContext,
sourceNode,
- mode,
theResult.get());
executionContext.processingInstruction(c_wstr(piName),
c_wstr(theResult.get()));
1.10 +1 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemPI.hpp 2001/03/02 15:35:42 1.9
+++ ElemPI.hpp 2001/03/06 21:22:43 1.10
@@ -105,8 +105,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
protected:
1.13 +3 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemTemplate.cpp 2001/03/02 15:35:44 1.12
+++ ElemTemplate.cpp 2001/03/06 21:22:44 1.13
@@ -161,10 +161,9 @@
void
ElemTemplate::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
- executeChildren(executionContext, sourceNode, mode);
+ executeChildren(executionContext, sourceNode);
}
1.10 +1 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemTemplate.hpp 2001/03/02 15:35:47 1.9
+++ ElemTemplate.hpp 2001/03/06 21:22:45 1.10
@@ -153,8 +153,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
private:
1.50 +10 -26 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ElemTemplateElement.cpp 2001/03/05 17:27:37 1.49
+++ ElemTemplateElement.cpp 2001/03/06 21:22:46 1.50
@@ -272,13 +272,12 @@
void
ElemTemplateElement::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
if(0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(
- TracerEvent(executionContext, sourceNode, mode, *this));
+ TracerEvent(executionContext, sourceNode, *this));
}
}
@@ -287,14 +286,13 @@
void
ElemTemplateElement::executeChildren(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
StylesheetExecutionContext::PushAndPopElementFrame
thePushAndPop(executionContext, this);
for (ElemTemplateElement* node = m_firstChild; node != 0; node =
node->m_nextSibling)
{
- node->execute(executionContext, sourceNode, mode);
+ node->execute(executionContext, sourceNode);
}
}
@@ -304,7 +302,6 @@
ElemTemplateElement::childrenToString(
StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
- const QName& mode,
XalanDOMString& result)
const
{
reserve(result, length(result) + 1024);
@@ -322,7 +319,7 @@
executionContext,
&theFormatter);
- executeChildren(executionContext, sourceNode, mode);
+ executeChildren(executionContext, sourceNode);
}
@@ -553,8 +550,7 @@
const Stylesheet&
stylesheetTree,
const ElemTemplateElement& xslInstruction,
const ElemTemplateElement* theTemplate,
- XalanNode*
sourceNodeContext,
- const QName& mode,
+ XalanNode*
sourceNodeContext,
const XPath*
selectPattern,
int
xslToken,
int
selectStackFrameIndex) const
@@ -665,7 +661,7 @@
TemplateElementContext callbackContext
= (null != callback)
? new TemplateElementContext(stylesheetTree,
xslInstruction,
- template, sourceNodeContext,
mode, xslToken, tcontext,
+ template, sourceNodeContext,
xslToken, tcontext,
savedCurrentStackFrameIndex) :
null;
*/
@@ -702,7 +698,6 @@
xslInstruction,
theTemplate,
sourceNodeContext,
- mode,
xslToken,
selectStackFrameIndex,
keys,
@@ -726,7 +721,6 @@
xslInstruction,
theTemplate,
sourceNodeContext,
- mode,
xslToken,
selectStackFrameIndex,
keys,
@@ -745,7 +739,6 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
XalanNode*
sourceNodeContext,
- const QName&
mode,
int
xslToken,
int
selectStackFrameIndex,
const NodeSorter::NodeSortKeyVectorType& keys,
@@ -782,7 +775,6 @@
xslInstruction,
theTemplate,
sourceNodeContext,
- mode,
xslToken,
*sortedSourceNodes,
sourceNodesCount);
@@ -795,7 +787,6 @@
xslInstruction,
theTemplate,
sourceNodeContext,
- mode,
xslToken,
sourceNodes,
sourceNodesCount);
@@ -811,7 +802,6 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
XalanNode*
sourceNodeContext,
- const QName&
mode,
int
xslToken,
int
selectStackFrameIndex,
const NodeSorter::NodeSortKeyVectorType& keys,
@@ -830,7 +820,6 @@
xslInstruction,
theTemplate,
sourceNodeContext,
- mode,
xslToken,
selectStackFrameIndex,
keys,
@@ -847,7 +836,6 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
XalanNode*
sourceNodeContext,
- const QName&
mode,
int
xslToken,
const NodeRefListBase&
sourceNodes,
unsigned int
sourceNodesCount) const
@@ -883,7 +871,6 @@
theTemplate,
sourceNodeContext,
childNode,
- mode,
xslToken);
}
}
@@ -898,7 +885,6 @@
const ElemTemplateElement* theTemplate,
XalanNode*
selectContext,
XalanNode* child,
- const QName& mode,
int
xslToken) const
{
const XalanNode::NodeType nodeType = child->getNodeType();
@@ -918,7 +904,7 @@
theTemplate = stylesheetTree->findTemplate(
executionContext,
child,
- mode,
+
*executionContext.getCurrentMode(),
isApplyImports,
foundStylesheet);
}
@@ -988,16 +974,14 @@
if(0 != executionContext.getTraceListeners())
{
TracerEvent te(executionContext,
- child,
- mode,
+ child,
*theTemplate);
executionContext.fireTraceEvent(te);
}
theTemplate->executeChildren(executionContext,
-
child,
-
mode);
+
child);
}
executionContext.resetCurrentState(selectContext);
1.25 +4 -19 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ElemTemplateElement.hpp 2001/03/02 15:35:53 1.24
+++ ElemTemplateElement.hpp 2001/03/06 21:22:47 1.25
@@ -199,26 +199,22 @@
*
* @param executionContext The current execution context
* @param sourceNode current context node
- * @param mode current mode
*/
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
/**
* Process the children of a template.
*
* @param processor XSLT processor instance
- * @param sourceNode current context node
- * @param mode current mode
+ * @param sourceNode current context node
*/
void
executeChildren(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
/**
* Take the contents of a template element, process it, and
@@ -226,14 +222,12 @@
*
* @param executionContext The current execution context
* @param sourceNode current source node context
- * @param mode current mode
* @param result result of executing the elements children
*/
void
childrenToString(
StylesheetExecutionContext&
executionContext,
XalanNode*
sourceNode,
- const QName& mode,
XalanDOMString& result)
const;
@@ -651,7 +645,6 @@
* not think we need this).
* @param template The owning template context.
* @param sourceNodeContext The current source node context.
- * @param mode The current mode.
* @param selectPattern The XPath with which to perform the selection.
* @param xslToken The current XSLT instruction (deprecated -- I do not
* think we want this).
@@ -665,7 +658,6 @@
const ElemTemplateElement& xslInstruction,
const ElemTemplateElement* theTemplate,
XalanNode*
sourceNodeContext,
- const QName& mode,
const XPath*
selectPattern,
int
xslToken,
int
selectStackFrameIndex) const;
@@ -679,7 +671,6 @@
* not think we need this).
* @param template The owning template context.
* @param sourceNodeContext The current source node context.
- * @param mode The current mode.
* @param selectPattern The XPath with which to perform the selection.
* @param xslToken The current XSLT instruction (deprecated -- I do not
* think we want this).
@@ -693,7 +684,6 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
XalanNode*
sourceNodeContext,
- const QName&
mode,
int
xslToken,
int
selectStackFrameIndex,
const NodeSorter::NodeSortKeyVectorType& keys,
@@ -709,7 +699,6 @@
* not think we need this).
* @param template The owning template context.
* @param sourceNodeContext The current source node context.
- * @param mode The current mode.
* @param selectPattern The XPath with which to perform the selection.
* @param xslToken The current XSLT instruction (deprecated -- I do not
* think we want this).
@@ -723,7 +712,6 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
XalanNode*
sourceNodeContext,
- const QName&
mode,
int
xslToken,
int
selectStackFrameIndex,
const NodeSorter::NodeSortKeyVectorType& keys,
@@ -737,13 +725,12 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
XalanNode*
sourceNodeContext,
- const QName&
mode,
int
xslToken,
const NodeRefListBase&
sourceNodes,
unsigned int
sourceNodesCount) const;
/**
- * Given an element and mode, find the corresponding
+ * Given an element, find the corresponding
* template and process the contents.
*
* @param executionContext The current execution context
@@ -753,7 +740,6 @@
* @param template The template to use if xsl:for-each, or null.
* @param selectContext The selection context.
* @param child The source context node.
- * @param mode The current mode, may be null.
* @param xslToken ELEMNAME_APPLY_TEMPLATES, ELEMNAME_APPLY_IMPORTS, or
* ELEMNAME_FOREACH.
* @return true if applied a template, false if not.
@@ -766,7 +752,6 @@
const ElemTemplateElement* theTemplate,
XalanNode*
selectContext,
XalanNode*
child,
- const QName& mode,
int
xslToken) const;
/**
1.11 +2 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemTextLiteral.cpp 2001/03/02 15:35:56 1.10
+++ ElemTextLiteral.cpp 2001/03/06 21:22:48 1.11
@@ -114,10 +114,9 @@
void
ElemTextLiteral::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
if(!m_disableOutputEscaping)
{
1.9 +1 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemTextLiteral.hpp 2001/03/02 15:35:58 1.8
+++ ElemTextLiteral.hpp 2001/03/06 21:22:49 1.9
@@ -136,8 +136,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
private:
1.10 +3 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemUse.cpp 2001/03/02 15:36:01 1.9
+++ ElemUse.cpp 2001/03/06 21:22:50 1.10
@@ -114,14 +114,13 @@
void
ElemUse::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
if(0 != m_attributeSetsNames.size())
getStylesheet().getStylesheetRoot().applyAttrSets(m_attributeSetsNames,
- executionContext, sourceNode, mode);
+ executionContext, sourceNode);
}
1.10 +1 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemUse.hpp 2001/03/02 15:36:03 1.9
+++ ElemUse.hpp 2001/03/06 21:22:50 1.10
@@ -126,8 +126,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
#if defined(XALAN_NO_NAMESPACES)
typedef vector<QNameByValue> QNameVectorType;
1.21 +2 -3 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemValueOf.cpp 2001/03/02 15:36:08 1.20
+++ ElemValueOf.cpp 2001/03/06 21:22:51 1.21
@@ -167,10 +167,9 @@
void
ElemValueOf::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
if (m_isDot == true)
{
1.11 +1 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemValueOf.hpp 2001/03/02 15:36:10 1.10
+++ ElemValueOf.hpp 2001/03/06 21:22:52 1.11
@@ -105,8 +105,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
private:
1.14 +2 -3 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemVariable.cpp 2001/03/02 15:36:11 1.13
+++ ElemVariable.cpp 2001/03/06 21:22:53 1.14
@@ -155,10 +155,9 @@
void
ElemVariable::execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
- ElemTemplateElement::execute(executionContext, sourceNode, mode);
+ ElemTemplateElement::execute(executionContext, sourceNode);
const XObjectPtr theValue(getValue(executionContext,
sourceNode));
1.13 +2 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemVariable.hpp 2001/03/02 15:36:14 1.12
+++ ElemVariable.hpp 2001/03/06 21:22:54 1.13
@@ -58,7 +58,7 @@
#define XALAN_ELEMVARIABLE_HEADER_GUARD
/**
- * $Id: ElemVariable.hpp,v 1.12 2001/03/02 15:36:14 auriemma Exp $
+ * $Id: ElemVariable.hpp,v 1.13 2001/03/06 21:22:54 auriemma Exp $
*
* $State: Exp $
*
@@ -148,8 +148,7 @@
virtual void
execute(
StylesheetExecutionContext&
executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
const XObjectPtr
getValue(
1.6 +0 -1 xml-xalan/c/src/XSLT/SelectionEvent.cpp
Index: SelectionEvent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/SelectionEvent.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SelectionEvent.cpp 2000/11/21 21:10:17 1.5
+++ SelectionEvent.cpp 2001/03/06 21:22:56 1.6
@@ -62,7 +62,6 @@
* @param processor The XSLT Processor.
* @param sourceTree The input source tree.
* @param sourceNode The current context node.
- * @param mode The current mode.
* @param m_styleNode node in the style tree reference for the event.
* Should not be null. That is not enforced.
*/
1.50 +3 -4 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Stylesheet.cpp 2001/03/02 15:36:17 1.49
+++ Stylesheet.cpp 2001/03/06 21:22:56 1.50
@@ -1464,8 +1464,7 @@
Stylesheet::applyAttrSets(
const QNameVectorType&
attributeSetsNames,
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const
+ XalanNode*
sourceNode) const
{
const QNameVectorType::size_type nNames =
attributeSetsNames.size();
@@ -1480,7 +1479,7 @@
const Stylesheet* const stylesheet =
m_imports[i];
stylesheet->applyAttrSets(attributeSetsNames,
-
executionContext, sourceNode, mode);
+
executionContext, sourceNode);
}
for(QNameVectorType::size_type j = 0; j < nNames; j++)
@@ -1495,7 +1494,7 @@
if(qname.equals(attrSet->getQName()))
{
- attrSet->execute(executionContext,
sourceNode, mode);
+ attrSet->execute(executionContext,
sourceNode);
}
}
}
1.33 +1 -3 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Stylesheet.hpp 2001/03/02 15:36:20 1.32
+++ Stylesheet.hpp 2001/03/06 21:22:58 1.33
@@ -535,14 +535,12 @@
* @param attributeSetsNames list of attribute set names
* @param executionContext current execution context
* @param sourceNode source node
- * @param mode execution mode
*/
void
applyAttrSets(
const QNameVectorType&
attributeSetsNames,
StylesheetExecutionContext& executionContext,
- XalanNode*
sourceNode,
- const QName& mode)
const;
+ XalanNode*
sourceNode) const;
/**
* Determine whether default whitespace processing is in effect
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StylesheetExecutionContext.cpp 2001/03/02 15:36:23 1.5
+++ StylesheetExecutionContext.cpp 2001/03/06 21:22:59 1.6
@@ -81,7 +81,6 @@
const ElemTemplateElement* /*
contextElement */,
const ElemTemplateElement&
xslCallTemplateElement,
XalanNode*
sourceNode,
- const QName& mode,
const ElemTemplateElement* targetTemplate)
:
m_executionContext(executionContext),
m_savedStackFrameIndex(executionContext.getCurrentStackFrameIndex())
@@ -93,7 +92,6 @@
executionContext.pushParams(
xslCallTemplateElement,
sourceNode,
- mode,
targetTemplate);
executionContext.setCurrentStackFrameIndex();
1.49 +17 -20 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- StylesheetExecutionContext.hpp 2001/03/02 15:36:26 1.48
+++ StylesheetExecutionContext.hpp 2001/03/06 21:22:59 1.49
@@ -209,6 +209,22 @@
setStylesheetRoot(const StylesheetRoot* theStylesheet) = 0;
/**
+ * Retrieve the current mode of the element
+ *
+ * @return QName for mode
+ */
+ virtual const QName*
+ getCurrentMode() const = 0;
+
+ /**
+ * Set the current mode of the element
+ *
+ * @param QName for mode
+ */
+ virtual void
+ setCurrentMode(const QName* theMode) = 0;
+
+ /**
* Reset the state of execution to node 'xmlNode' in source tree
'sourceTree.'
*
* @param xmlNode node to execute
@@ -509,7 +525,6 @@
* Create an ResultTreeFragment as a variable and push it
* on to the stack with the current context.
*
- * @param name name of variable
* @param element element marker for variable
* @param templateChild result tree fragment to use.
* @param sourceNode source node
@@ -519,8 +534,7 @@
createVariable(
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceNode,
- const QName& mode) = 0;
+ XalanNode*
sourceNode) = 0;
/**
* Execute an XPath using the provided expression,
@@ -636,14 +650,12 @@
*
* @param xslCallTemplateElement "call-template" element
* @param sourceNode source node
- * @param mode mode under which the template is
operating
* @param targetTemplate target template
*/
virtual void
pushParams(
const ElemTemplateElement& xslCallTemplateElement,
XalanNode*
sourceNode,
- const QName& mode,
const ElemTemplateElement* targetTemplate) = 0;
/**
@@ -765,7 +777,6 @@
const ElemTemplateElement* contextElement,
const ElemTemplateElement&
xslCallTemplateElement,
XalanNode*
sourceNode,
- const QName& mode,
const ElemTemplateElement* targetTemplate);
~ParamsPushPop();
@@ -950,20 +961,6 @@
createXResultTreeFrag(
const ElemTemplateElement& templateChild,
XalanNode*
sourceNode) = 0;
-
- /**
- * Create an XObject that represents a Result tree fragment.
- *
- * @param templateChild result tree fragment to use.
- * @param sourceNode source node
- * @param mode current mode
- * @return XObject instance
- */
- virtual const XObjectPtr
- createXResultTreeFrag(
- const ElemTemplateElement& templateChild,
- XalanNode*
sourceNode,
- const QName& mode) = 0;
/**
* Output an object to the result tree by doing the right conversions.
1.58 +26 -22
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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- StylesheetExecutionContextDefault.cpp 2001/03/02 19:11:34 1.57
+++ StylesheetExecutionContextDefault.cpp 2001/03/06 21:23:00 1.58
@@ -147,8 +147,10 @@
m_countersTable(),
m_useDOMResultTreeFactory(false),
m_ignoreHTMLElementNamespaces(false),
- m_sourceTreeResultTreeFactory()
+ m_sourceTreeResultTreeFactory(),
+ m_mode(0)
{
+ m_mode = 0;
}
@@ -213,6 +215,22 @@
+const QName*
+StylesheetExecutionContextDefault::getCurrentMode() const
+{
+ return m_mode;
+}
+
+
+
+void
+StylesheetExecutionContextDefault::setCurrentMode(const QName* theMode)
+{
+ m_mode = theMode;
+}
+
+
+
void
StylesheetExecutionContextDefault::resetCurrentState(
XalanNode* xmlNode)
@@ -465,10 +483,9 @@
StylesheetExecutionContextDefault::createVariable(
const ElemTemplateElement* /* element */,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceNode,
- const QName& mode)
+ XalanNode*
sourceNode)
{
- return createXResultTreeFrag(templateChild, sourceNode, mode);
+ return createXResultTreeFrag(templateChild, sourceNode);
}
@@ -605,7 +622,6 @@
StylesheetExecutionContextDefault::pushParams(
const ElemTemplateElement& xslCallTemplateElement,
XalanNode*
sourceNode,
- const QName& mode,
const ElemTemplateElement* targetTemplate)
{
const ElemTemplateElement* child =
@@ -661,8 +677,7 @@
createVariable(
&xslCallTemplateElement,
*xslParamElement,
- sourceNode,
- mode);
+ sourceNode);
}
m_paramsVector.push_back(ParamsVectorType::value_type(&xslParamElement->getQName(),
theXObject));
@@ -831,19 +846,6 @@
const ElemTemplateElement& templateChild,
XalanNode*
sourceNode)
{
- return createXResultTreeFrag(templateChild,
- sourceNode,
-
QNameByReference());
-}
-
-
-
-const XObjectPtr
-StylesheetExecutionContextDefault::createXResultTreeFrag(
- const ElemTemplateElement& templateChild,
- XalanNode*
sourceNode,
- const QName& mode)
-{
BorrowReturnResultTreeFrag theResultTreeFrag(*this);
if (m_useDOMResultTreeFactory == true)
@@ -863,7 +865,7 @@
*this,
&tempFormatter);
- templateChild.executeChildren(*this, sourceNode, mode);
+ templateChild.executeChildren(*this, sourceNode);
}
else
{
@@ -881,7 +883,7 @@
*this,
&tempFormatter);
- templateChild.executeChildren(*this, sourceNode, mode);
+ templateChild.executeChildren(*this, sourceNode);
}
return getXObjectFactory().createResultTreeFrag(theResultTreeFrag);
@@ -1291,6 +1293,8 @@
m_variablesStack.reset();
m_xsltProcessor.reset();
+
+ m_mode = 0;
// Just in case endDocument() was not called,
// clean things up...
1.51 +10 -10
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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- StylesheetExecutionContextDefault.hpp 2001/03/02 15:36:33 1.50
+++ StylesheetExecutionContextDefault.hpp 2001/03/06 21:23:01 1.51
@@ -207,7 +207,6 @@
m_ignoreHTMLElementNamespaces = theValue;
}
-
// These interfaces are inherited from StylesheetExecutionContext...
virtual bool
@@ -225,6 +224,12 @@
virtual void
setStylesheetRoot(const StylesheetRoot* theStylesheet);
+ virtual const QName*
+ getCurrentMode() const;
+
+ virtual void
+ setCurrentMode(const QName* theMode);
+
virtual void
resetCurrentState(
XalanNode* xmlNode);
@@ -316,8 +321,7 @@
createVariable(
const ElemTemplateElement* element,
const ElemTemplateElement& templateChild,
- XalanNode*
sourceNode,
- const QName& mode);
+ XalanNode*
sourceNode);
virtual void
pushVariable(
@@ -370,7 +374,6 @@
pushParams(
const ElemTemplateElement& xslCallTemplateElement,
XalanNode*
sourceNode,
- const QName& mode,
const ElemTemplateElement* targetTemplate);
virtual const XObjectPtr
@@ -435,12 +438,6 @@
const ElemTemplateElement& templateChild,
XalanNode*
sourceNode);
- virtual const XObjectPtr
- createXResultTreeFrag(
- const ElemTemplateElement& templateChild,
- XalanNode*
sourceNode,
- const QName& mode);
-
virtual void
outputToResultTree(const XObject& xobj);
@@ -926,6 +923,9 @@
// namespaces. This is an optimization which can lead to
// non-conforming behavior.
bool
m_ignoreHTMLElementNamespaces;
+
+ // Holds the current mode.
+ const QName* m_mode;
/**
* The factory that will be used to create result tree fragments based
on our
1.38 +1 -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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- StylesheetRoot.cpp 2001/03/02 15:36:36 1.37
+++ StylesheetRoot.cpp 2001/03/06 21:23:02 1.38
@@ -226,7 +226,7 @@
// Output the action of the found root rule. All processing
// occurs from here.
- rootRule->execute(executionContext, sourceTree, QNameByReference());
+ rootRule->execute(executionContext, sourceTree);
// At this point, anything transient during the tranformation
// may have been deleted, so we may not refer to anything the
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TracerEvent.cpp 2001/03/02 15:36:39 1.5
+++ TracerEvent.cpp 2001/03/06 21:23:03 1.6
@@ -71,11 +71,9 @@
TracerEvent::TracerEvent(
const StylesheetExecutionContext&
executionContext,
const XalanNode*
sourceNode,
- const QName&
mode,
const ElemTemplateElement&
styleNode) :
m_executionContext(executionContext),
m_sourceNode(sourceNode),
- m_mode(mode),
m_styleNode(styleNode)
{
}
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TracerEvent.hpp 2001/03/02 15:36:41 1.5
+++ TracerEvent.hpp 2001/03/06 21:23:04 1.6
@@ -90,13 +90,11 @@
*
* @param executionContext XSLT processor instance
* @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*
sourceNode,
- const QName&
mode,
const ElemTemplateElement&
styleNode);
virtual
@@ -136,11 +134,6 @@
*/
const XalanNode*
m_sourceNode;
- /**
- * The current mode.
- */
- const QName& m_mode;
-
/**
* The node in the style tree where the event occurs.
*/
