mhoyt 2004/07/30 22:08:54
Modified: c/src/xalanc/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 ElemElement.cpp
ElemElement.hpp ElemEmpty.cpp ElemEmpty.hpp
ElemExtensionCall.cpp ElemExtensionCall.hpp
ElemFallback.cpp ElemFallback.hpp ElemForEach.cpp
ElemForEach.hpp ElemForwardCompatible.cpp
ElemForwardCompatible.hpp ElemIf.cpp ElemIf.hpp
ElemLiteralResult.cpp ElemLiteralResult.hpp
ElemMessage.cpp ElemMessage.hpp ElemNumber.cpp
ElemNumber.hpp ElemOtherwise.cpp ElemOtherwise.hpp
ElemPI.cpp ElemPI.hpp ElemParam.cpp ElemParam.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 ElemWhen.cpp
ElemWhen.hpp ElemWithParam.cpp ElemWithParam.hpp
StylesheetExecutionContext.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetRoot.cpp StylesheetRoot.hpp
Log:
Modified defines to make Iterative execution default (#define
XALAN_RECURSIVE_STYLESHEET_EXECUTION to enable original model)
Revision Changes Path
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemApplyImport.cpp
Index: ElemApplyImport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemApplyImport.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemApplyImport.cpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemApplyImport.cpp 31 Jul 2004 05:08:48 -0000 1.8
@@ -85,7 +85,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemApplyImport::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -133,7 +133,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemApplyImport::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemApplyImport.hpp
Index: ElemApplyImport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemApplyImport.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemApplyImport.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemApplyImport.hpp 31 Jul 2004 05:08:48 -0000 1.6
@@ -59,7 +59,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.9 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemApplyTemplates.cpp
Index: ElemApplyTemplates.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemApplyTemplates.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemApplyTemplates.cpp 28 Jun 2004 04:20:32 -0000 1.8
+++ ElemApplyTemplates.cpp 31 Jul 2004 05:08:48 -0000 1.9
@@ -129,7 +129,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemApplyTemplates::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -270,7 +270,7 @@
#endif
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemApplyTemplates::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemApplyTemplates.hpp
Index: ElemApplyTemplates.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemApplyTemplates.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemApplyTemplates.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemApplyTemplates.hpp 31 Jul 2004 05:08:48 -0000 1.6
@@ -64,7 +64,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
@@ -91,7 +91,7 @@
virtual bool
childTypeAllowed(int xslToken) const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
findNextTemplateToExecute(StylesheetExecutionContext& executionContext)
const;
#else
1.9 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemAttribute.cpp
Index: ElemAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemAttribute.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemAttribute.cpp 28 Jun 2004 04:20:32 -0000 1.8
+++ ElemAttribute.cpp 31 Jul 2004 05:08:48 -0000 1.9
@@ -113,7 +113,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemAttribute::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -416,7 +416,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemAttribute::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemAttribute.hpp
Index: ElemAttribute.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemAttribute.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemAttribute.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemAttribute.hpp 31 Jul 2004 05:08:48 -0000 1.6
@@ -63,7 +63,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.9 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemAttributeSet.cpp 28 Jun 2004 04:20:32 -0000 1.8
+++ ElemAttributeSet.cpp 31 Jul 2004 05:08:48 -0000 1.9
@@ -113,7 +113,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemAttributeSet::startElement(StylesheetExecutionContext& executionContext)
const
{
@@ -147,7 +147,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemAttributeSet::execute(StylesheetExecutionContext&
executionContext) const
{
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemAttributeSet.hpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemAttributeSet.hpp 31 Jul 2004 05:08:48 -0000 1.7
@@ -74,7 +74,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.10 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemCallTemplate.cpp
Index: ElemCallTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCallTemplate.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemCallTemplate.cpp 28 Jun 2004 04:20:32 -0000 1.9
+++ ElemCallTemplate.cpp 31 Jul 2004 05:08:48 -0000 1.10
@@ -118,7 +118,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemCallTemplate::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -188,7 +188,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemCallTemplate::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemCallTemplate.hpp
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemCallTemplate.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemCallTemplate.hpp 31 Jul 2004 05:08:48 -0000 1.6
@@ -64,7 +64,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemChoose.cpp
Index: ElemChoose.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemChoose.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemChoose.cpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemChoose.cpp 31 Jul 2004 05:08:48 -0000 1.8
@@ -86,7 +86,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemChoose::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -148,7 +148,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemChoose::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemChoose.hpp
Index: ElemChoose.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemChoose.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemChoose.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemChoose.hpp 31 Jul 2004 05:08:48 -0000 1.6
@@ -57,7 +57,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemComment.cpp
Index: ElemComment.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemComment.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemComment.cpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemComment.cpp 31 Jul 2004 05:08:48 -0000 1.7
@@ -83,7 +83,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemComment::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -115,7 +115,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemComment::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemComment.hpp
Index: ElemComment.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemComment.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemComment.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemComment.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -60,7 +60,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.10 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemCopy.cpp
Index: ElemCopy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCopy.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemCopy.cpp 28 Jun 2004 04:20:32 -0000 1.9
+++ ElemCopy.cpp 31 Jul 2004 05:08:49 -0000 1.10
@@ -84,7 +84,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemCopy::startElement(StylesheetExecutionContext& executionContext) const
{
@@ -170,7 +170,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemCopy::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemCopy.hpp
Index: ElemCopy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCopy.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemCopy.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemCopy.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -57,7 +57,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.9 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemCopyOf.cpp
Index: ElemCopyOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCopyOf.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemCopyOf.cpp 28 Jun 2004 04:20:32 -0000 1.8
+++ ElemCopyOf.cpp 31 Jul 2004 05:08:49 -0000 1.9
@@ -113,7 +113,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemCopyOf::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -198,7 +198,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemCopyOf::execute(StylesheetExecutionContext&
executionContext) const
{
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemCopyOf.hpp
Index: ElemCopyOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemCopyOf.hpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemCopyOf.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -69,7 +69,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
#else
1.10 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemElement.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemElement.cpp 28 Jun 2004 04:20:32 -0000 1.9
+++ ElemElement.cpp 31 Jul 2004 05:08:49 -0000 1.10
@@ -115,7 +115,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemElement::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -324,7 +324,7 @@
-#if !defined (ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemElement::execute(StylesheetExecutionContext&
executionContext) const
{
1.7 +3 -3 xml-xalan/c/src/xalanc/XSLT/ElemElement.hpp
Index: ElemElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemElement.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemElement.hpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemElement.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -71,7 +71,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
@@ -89,7 +89,7 @@
protected:
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Process the children of a template.
*
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemEmpty.cpp
Index: ElemEmpty.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemEmpty.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemEmpty.cpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemEmpty.cpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -74,7 +74,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemEmpty::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -87,7 +87,7 @@
#endif
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemEmpty::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemEmpty.hpp
Index: ElemEmpty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemEmpty.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemEmpty.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemEmpty.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -77,7 +77,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
#else
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemExtensionCall.cpp
Index: ElemExtensionCall.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemExtensionCall.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemExtensionCall.cpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemExtensionCall.cpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -54,7 +54,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemExtensionCall::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -88,7 +88,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemExtensionCall::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemExtensionCall.hpp
Index: ElemExtensionCall.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemExtensionCall.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemExtensionCall.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemExtensionCall.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -63,7 +63,7 @@
// These methods are inherited from ElemLiteralResult ...
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.9 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemFallback.cpp
Index: ElemFallback.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemFallback.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemFallback.cpp 28 Jun 2004 04:20:32 -0000 1.8
+++ ElemFallback.cpp 31 Jul 2004 05:08:49 -0000 1.9
@@ -86,7 +86,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemFallback::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -119,7 +119,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemFallback::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemFallback.hpp
Index: ElemFallback.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemFallback.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemFallback.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemFallback.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -59,7 +59,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.13 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemForEach.cpp
Index: ElemForEach.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemForEach.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemForEach.cpp 28 Jun 2004 14:19:57 -0000 1.12
+++ ElemForEach.cpp 31 Jul 2004 05:08:49 -0000 1.13
@@ -177,7 +177,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemForEach::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -487,7 +487,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemForEach::execute(StylesheetExecutionContext& executionContext) const
{
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemForEach.hpp
Index: ElemForEach.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemForEach.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemForEach.hpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemForEach.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -100,7 +100,7 @@
StylesheetConstructionContext& constructionContext,
const NamespacesHandler&
theParentHandler);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
@@ -137,7 +137,7 @@
int
columnNumber,
int
xslToken);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/*
* Returns a pointer to a list of the selected nodes. The
1.5 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemForwardCompatible.cpp
Index: ElemForwardCompatible.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemForwardCompatible.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemForwardCompatible.cpp 28 Jun 2004 04:20:32 -0000 1.4
+++ ElemForwardCompatible.cpp 31 Jul 2004 05:08:49 -0000 1.5
@@ -89,7 +89,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemForwardCompatible::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -110,7 +110,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemForwardCompatible::execute(StylesheetExecutionContext&
executionContext) const
{
1.5 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemForwardCompatible.hpp
Index: ElemForwardCompatible.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemForwardCompatible.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemForwardCompatible.hpp 28 Jun 2004 04:20:32 -0000 1.4
+++ ElemForwardCompatible.hpp 31 Jul 2004 05:08:49 -0000 1.5
@@ -62,7 +62,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemIf.cpp
Index: ElemIf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemIf.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemIf.cpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemIf.cpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -101,7 +101,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemIf::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -148,7 +148,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemIf::execute(StylesheetExecutionContext& executionContext) const
{
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemIf.hpp
Index: ElemIf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemIf.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemIf.hpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemIf.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -59,7 +59,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemLiteralResult.cpp
Index: ElemLiteralResult.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemLiteralResult.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemLiteralResult.cpp 28 Jun 2004 05:06:09 -0000 1.7
+++ ElemLiteralResult.cpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -300,7 +300,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemLiteralResult::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -384,7 +384,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemLiteralResult::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemLiteralResult.hpp
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemLiteralResult.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemLiteralResult.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -78,7 +78,7 @@
int
which,
StylesheetConstructionContext& constructionContext)
const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext&
executionContext) const;
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemMessage.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemMessage.cpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemMessage.cpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -95,7 +95,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemMessage::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -139,7 +139,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemMessage::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemMessage.hpp
Index: ElemMessage.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemMessage.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemMessage.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemMessage.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -59,7 +59,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext&
executionContext) const;
1.10 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemNumber.cpp 28 Jun 2004 04:20:32 -0000 1.9
+++ ElemNumber.cpp 31 Jul 2004 05:08:49 -0000 1.10
@@ -179,7 +179,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemNumber::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -204,7 +204,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemNumber::execute(StylesheetExecutionContext&
executionContext) const
{
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemNumber.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemNumber.hpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemNumber.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -111,7 +111,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext&
executionContext) const;
#else
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemOtherwise.cpp
Index: ElemOtherwise.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemOtherwise.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemOtherwise.cpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemOtherwise.cpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -76,7 +76,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemOtherwise::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -96,7 +96,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemOtherwise::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemOtherwise.hpp
Index: ElemOtherwise.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemOtherwise.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemOtherwise.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemOtherwise.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -55,7 +55,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemPI.cpp
Index: ElemPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemPI.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemPI.cpp 28 Jun 2004 04:20:32 -0000 1.6
+++ ElemPI.cpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -102,7 +102,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemPI::startElement(StylesheetExecutionContext& executionContext) const
{
@@ -152,7 +152,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemPI::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemPI.hpp
Index: ElemPI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemPI.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemPI.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemPI.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -65,7 +65,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext&
executionContext) const;
1.6 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemParam.cpp
Index: ElemParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemParam.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemParam.cpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemParam.cpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -59,7 +59,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemParam::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -104,7 +104,7 @@
-#if !defined (ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemParam::execute(StylesheetExecutionContext&
executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemParam.hpp
Index: ElemParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemParam.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemParam.hpp 28 Jun 2004 04:20:32 -0000 1.5
+++ ElemParam.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -57,7 +57,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.10 +3 -3 xml-xalan/c/src/xalanc/XSLT/ElemTemplate.cpp
Index: ElemTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplate.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemTemplate.cpp 28 Jun 2004 04:20:32 -0000 1.9
+++ ElemTemplate.cpp 31 Jul 2004 05:08:49 -0000 1.10
@@ -178,7 +178,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemTemplate::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -210,7 +210,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemTemplate::execute(StylesheetExecutionContext& executionContext) const
{
@@ -228,7 +228,7 @@
}
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemTemplate::executeChildren(StylesheetExecutionContext&
executionContext) const
{
1.8 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemTemplate.hpp
Index: ElemTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplate.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemTemplate.hpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemTemplate.hpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -110,7 +110,7 @@
getElementName() const;
// These methods are inherited from ElemTemplateElement ...
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.21 +4 -4 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemTemplateElement.cpp 29 Jul 2004 20:07:07 -0000 1.20
+++ ElemTemplateElement.cpp 31 Jul 2004 05:08:49 -0000 1.21
@@ -209,7 +209,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemTemplateElement::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -371,7 +371,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemTemplateElement::execute(StylesheetExecutionContext&
executionContext) const
{
@@ -745,7 +745,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemTemplateElement::findTemplateToTransformChild(
StylesheetExecutionContext&
executionContext,
@@ -1245,7 +1245,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemTemplateElement::getNextChildElemToExecute(StylesheetExecutionContext&
executionContext,
const
ElemTemplateElement* currentElem) const
1.8 +6 -6 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemTemplateElement.hpp 28 Jun 2004 04:20:32 -0000 1.7
+++ ElemTemplateElement.hpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -160,7 +160,7 @@
static bool
isValidNCName(const XalanDOMString& s);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Completes "pre-processing" before any sub-elements are invoked
@@ -208,7 +208,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Execute the element's primary function. Subclasses of this
function may
* recursively execute down the element tree.
@@ -452,7 +452,7 @@
virtual ElemTemplateElement*
getFirstChildElem() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Method to initiate the execution of the element's children.
*
@@ -526,7 +526,7 @@
virtual ElemTemplateElement*
getNextSiblingElem() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Returns the next sub-element
@@ -788,7 +788,7 @@
const XalanDOMString*
getNamespaceForPrefixInternal(const XalanDOMString& prefix) const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Given an element, find the corresponding
* template.
@@ -934,7 +934,7 @@
}
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Take the contents of a template element, process it, and
* convert it to a string.
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemTextLiteral.cpp
Index: ElemTextLiteral.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTextLiteral.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemTextLiteral.cpp 28 Jun 2004 04:20:33 -0000 1.6
+++ ElemTextLiteral.cpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -85,7 +85,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemTextLiteral::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -105,7 +105,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemTextLiteral::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemTextLiteral.hpp
Index: ElemTextLiteral.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTextLiteral.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemTextLiteral.hpp 28 Jun 2004 04:20:33 -0000 1.5
+++ ElemTextLiteral.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -97,7 +97,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
#else
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemUse.cpp
Index: ElemUse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemUse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemUse.cpp 28 Jun 2004 04:20:33 -0000 1.6
+++ ElemUse.cpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -92,7 +92,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemUse::startElement(StylesheetExecutionContext& executionContext) const
{
@@ -228,7 +228,7 @@
#endif
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemUse::execute(StylesheetExecutionContext& executionContext) const
{
1.6 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemUse.hpp
Index: ElemUse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemUse.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemUse.hpp 28 Jun 2004 04:20:33 -0000 1.5
+++ ElemUse.hpp 31 Jul 2004 05:08:49 -0000 1.6
@@ -89,7 +89,7 @@
StylesheetConstructionContext& constructionContext,
const NamespacesHandler&
theParentHandler);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
@@ -112,7 +112,7 @@
protected:
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Get the next attribute set to execute.
*
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemValueOf.cpp
Index: ElemValueOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemValueOf.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemValueOf.cpp 28 Jun 2004 04:20:33 -0000 1.7
+++ ElemValueOf.cpp 31 Jul 2004 05:08:49 -0000 1.8
@@ -239,7 +239,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemValueOf::startElement(StylesheetExecutionContext&
executionContext) const
{
@@ -294,7 +294,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemValueOf::execute(StylesheetExecutionContext& executionContext) const
{
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemValueOf.hpp
Index: ElemValueOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemValueOf.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemValueOf.hpp 28 Jun 2004 04:20:33 -0000 1.6
+++ ElemValueOf.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -65,7 +65,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext&
executionContext) const;
#else
1.10 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemVariable.cpp
Index: ElemVariable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemVariable.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemVariable.cpp 28 Jun 2004 04:20:33 -0000 1.9
+++ ElemVariable.cpp 31 Jul 2004 05:08:49 -0000 1.10
@@ -219,7 +219,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemVariable::startElement(StylesheetExecutionContext& executionContext)
const
{
@@ -358,7 +358,7 @@
else
{
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
executionContext.beginCreateXResultTreeFrag(sourceNode);
this->executeChildren(executionContext);
return executionContext.endCreateXResultTreeFrag();
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemVariable.hpp
Index: ElemVariable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemVariable.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemVariable.hpp 28 Jun 2004 04:20:33 -0000 1.6
+++ ElemVariable.hpp 31 Jul 2004 05:08:49 -0000 1.7
@@ -98,7 +98,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.8 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemWhen.cpp
Index: ElemWhen.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemWhen.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemWhen.cpp 28 Jun 2004 04:20:33 -0000 1.7
+++ ElemWhen.cpp 31 Jul 2004 05:08:50 -0000 1.8
@@ -92,7 +92,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemWhen::startElement(StylesheetExecutionContext& executionContext) const
{
@@ -112,7 +112,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemWhen::execute(StylesheetExecutionContext& executionContext) const
{
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemWhen.hpp
Index: ElemWhen.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemWhen.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemWhen.hpp 28 Jun 2004 04:20:33 -0000 1.6
+++ ElemWhen.hpp 31 Jul 2004 05:08:50 -0000 1.7
@@ -59,7 +59,7 @@
virtual const XalanDOMString&
getElementName() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.8 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemWithParam.cpp
Index: ElemWithParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemWithParam.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemWithParam.cpp 28 Jun 2004 04:20:33 -0000 1.7
+++ ElemWithParam.cpp 31 Jul 2004 05:08:50 -0000 1.8
@@ -131,7 +131,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemWithParam::startElement(StylesheetExecutionContext& executionContext)
const
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemWithParam.hpp
Index: ElemWithParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemWithParam.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemWithParam.hpp 28 Jun 2004 04:20:33 -0000 1.6
+++ ElemWithParam.hpp 31 Jul 2004 05:08:50 -0000 1.7
@@ -78,7 +78,7 @@
virtual const XPath*
getXPath(unsigned int index = 0) const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const ElemTemplateElement*
startElement(StylesheetExecutionContext& executionContext) const;
1.9 +1 -1
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.cpp
Index: StylesheetExecutionContext.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StylesheetExecutionContext.cpp 28 Jun 2004 04:20:33 -0000 1.8
+++ StylesheetExecutionContext.cpp 31 Jul 2004 05:08:50 -0000 1.9
@@ -42,7 +42,7 @@
}
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContext::ParamsPushPop::doPush(
const ElemTemplateElement&
xslCallTemplateElement,
1.20 +10 -10
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StylesheetExecutionContext.hpp 27 Jul 2004 20:04:04 -0000 1.19
+++ StylesheetExecutionContext.hpp 31 Jul 2004 05:08:50 -0000 1.20
@@ -271,7 +271,7 @@
};
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Set the flag that determines if the current attribute should be
executed
* @param processAttribute the value of the flag
@@ -724,7 +724,7 @@
XalanNode*
contextNode,
const PrefixResolver& resolver) = 0;
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Create an ResultTreeFragment as a variable and push it
* on to the stack with the current context.
@@ -778,7 +778,7 @@
XalanNode*
contextNode,
const PrefixResolver& resolver) = 0;
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Create an ResultTreeFragment as a variable and push it
* on to the stack with the current context.
@@ -909,7 +909,7 @@
StylesheetExecutionContext& m_executionContext;
};
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Initiate context to accept a new set of parameters
*/
@@ -1216,7 +1216,7 @@
bool
shouldCloneAttributes,
const LocatorType* locator) = 0;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Initiate creation of a result tree fragment
* @param sourceNode the source Node
@@ -1510,7 +1510,7 @@
Writer& writer,
const XalanDOMString& encoding) = 0;
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
class BorrowReturnFormatterToText
{
public:
@@ -1561,7 +1561,7 @@
friend class BorrowReturnFormatterToText;
#endif
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Get node sorter instance
*/
@@ -1645,7 +1645,7 @@
virtual XalanNumberFormatAutoPtr
createXalanNumberFormat() = 0;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/*
* A class to manage the attribute sets that have been executed
* by an element
@@ -2022,7 +2022,7 @@
virtual MutableNodeRefList*
createMutableNodeRefList() const = 0;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual MutableNodeRefList&
createAndPushMutableNodeRefList() = 0;
@@ -2180,7 +2180,7 @@
const XalanNode* sourceNode = 0,
const LocatorType* locator = 0) const = 0;
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
protected:
/**
* Borrow a cached FormatterToText instance.
1.29 +15 -15
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StylesheetExecutionContextDefault.cpp 28 Jun 2004 14:19:57 -0000
1.28
+++ StylesheetExecutionContextDefault.cpp 31 Jul 2004 05:08:50 -0000
1.29
@@ -134,7 +134,7 @@
m_copyTextNodesOnlyStack(),
m_modeStack(),
m_currentIndexStack(),
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
m_xobjectPtrStack(),
m_mutableNodeRefListStack(),
m_nodesToTransformStack(),
@@ -194,7 +194,7 @@
m_copyTextNodesOnlyStack(),
m_modeStack(),
m_currentIndexStack(),
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
m_xobjectPtrStack(),
m_mutableNodeRefListStack(),
m_nodesToTransformStack(),
@@ -664,7 +664,7 @@
}
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const XObjectPtr
StylesheetExecutionContextDefault::createVariable(
const ElemTemplateElement& templateChild,
@@ -736,7 +736,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContextDefault::pushVariable(
const XalanQName& name,
@@ -791,7 +791,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContextDefault::beginParams()
{
@@ -825,7 +825,7 @@
#endif
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContextDefault::pushParams(const ElemTemplateElement&
xslCallTemplateElement)
{
@@ -1060,7 +1060,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContextDefault::beginCreateXResultTreeFrag(
XalanNode*
sourceNode)
@@ -1133,7 +1133,7 @@
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const XObjectPtr
StylesheetExecutionContextDefault::createXResultTreeFrag(
const ElemTemplateElement& templateChild,
@@ -1505,7 +1505,7 @@
}
-#if !defined (ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
FormatterToText*
StylesheetExecutionContextDefault::borrowFormatterToText()
{
@@ -1523,7 +1523,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
NodeSorter*
StylesheetExecutionContextDefault::getNodeSorter()
{
@@ -1532,7 +1532,7 @@
#endif
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
NodeSorter*
StylesheetExecutionContextDefault::borrowNodeSorter()
{
@@ -1884,7 +1884,7 @@
m_currentTemplateStack.clear();
m_currentTemplateStack.push_back(0);
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
m_formatterToTextCache.reset();
m_formatterToSourceTreeCache.reset();
m_nodeSorterCache.reset();
@@ -1912,7 +1912,7 @@
m_currentIndexStack.clear();
-#if defined (ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
m_xobjectPtrStack.clear();
m_nodesToTransformStack.clear();
m_processCurrentAttributeStack.clear();
@@ -2663,7 +2663,7 @@
};
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContextDefault::getParams(
const ElemTemplateElement& xslCallTemplateElement,
@@ -2898,7 +2898,7 @@
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetExecutionContextDefault::createUseAttributeSetIndexesOnStack()
{
1.25 +12 -12
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StylesheetExecutionContextDefault.hpp 30 Jun 2004 14:58:45 -0000
1.24
+++ StylesheetExecutionContextDefault.hpp 31 Jul 2004 05:08:50 -0000
1.25
@@ -260,7 +260,7 @@
virtual bool
popCopyTextNodesOnly();
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual void
pushProcessCurrentAttribute(bool processAttribute);
@@ -397,7 +397,7 @@
XalanNode*
contextNode,
const PrefixResolver& resolver);
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const XObjectPtr
createVariable(
const ElemTemplateElement& templateChild,
@@ -432,7 +432,7 @@
XalanNode*
contextNode,
const PrefixResolver& resolver);
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual void
pushVariable(
const XalanQName& name,
@@ -454,7 +454,7 @@
virtual void
clearTopLevelParams();
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual void beginParams();
virtual void endParams();
@@ -534,7 +534,7 @@
bool
shouldCloneAttributes,
const LocatorType* locator);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual void
beginCreateXResultTreeFrag(
XalanNode*
sourceNode);
@@ -552,7 +552,7 @@
#endif
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual const XObjectPtr
createXResultTreeFrag(
const ElemTemplateElement& templateChild,
@@ -629,7 +629,7 @@
Writer& writer,
const XalanDOMString& encoding);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual NodeSorter*
getNodeSorter();
#else
@@ -909,7 +909,7 @@
virtual MutableNodeRefList*
createMutableNodeRefList() const;
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual void
createUseAttributeSetIndexesOnStack();
@@ -1077,7 +1077,7 @@
XalanSourceTreeDocument*
getSourceTreeFactory() const;
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
protected:
virtual FormatterToText*
@@ -1092,7 +1092,7 @@
const XalanDecimalFormatSymbols*
getDecimalFormatSymbols(const XalanQName& qname);
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Given a context, create the params for a template
* call.
@@ -1216,7 +1216,7 @@
ModeStackType m_modeStack;
IntStackType
m_currentIndexStack;
-#if !defined(ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
typedef XalanObjectCacheDefault<FormatterToText>
FormatterToTextCacheType;
typedef XalanObjectCacheDefault<FormatterToSourceTree>
FormatterToSourceTreeCacheType;
typedef XalanObjectCacheDefault<NodeSorter>
NodeSorterCacheType;
@@ -1228,7 +1228,7 @@
NodeSorterCacheType
m_nodeSorterCache;
#endif
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
typedef XALAN_STD_QUALIFIER vector<XObjectPtr>
XObjectPtrStackType;
typedef XALAN_STD_QUALIFIER vector<ParamsVectorType>
ParamsVectorStackType;
typedef XALAN_STD_QUALIFIER vector<UseAttributeSetIndexes>
UseAttributeSetIndexesStackType;
1.19 +2 -2 xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StylesheetRoot.cpp 28 Jun 2004 04:20:33 -0000 1.18
+++ StylesheetRoot.cpp 31 Jul 2004 05:08:50 -0000 1.19
@@ -838,7 +838,7 @@
}
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemAttributeSet*
StylesheetRoot::getAttributeSet(
StylesheetExecutionContext&
executionContext,
@@ -873,7 +873,7 @@
-#if !defined (ITERATIVE_EXECUTION)
+#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
StylesheetRoot::executeAttributeSet(
StylesheetExecutionContext&
theExecutionContext,
1.9 +1 -1 xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.hpp
Index: StylesheetRoot.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StylesheetRoot.hpp 28 Jun 2004 04:20:33 -0000 1.8
+++ StylesheetRoot.hpp 31 Jul 2004 05:08:50 -0000 1.9
@@ -387,7 +387,7 @@
void
addAttributeSet(ElemAttributeSet& theAttributeSet);
-#if defined(ITERATIVE_EXECUTION)
+#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Get the nth attribute set with the specified name.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
