mhoyt 2005/02/08 14:19:59
Modified: c/src/xalanc/XSLT ElemTemplateElement.cpp
Log:
Fix to delay pushing context marker for direct template calls until
"getFirstChildElemToExecute" is invoked.
Without this change, an AVT that belongs literal result elements that
contains a single <xsl:call-template ...> element would fail to resolve if it
referred to a local variable.
Revision Changes Path
1.25 +3 -5 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ElemTemplateElement.cpp 8 Nov 2004 18:18:56 -0000 1.24
+++ ElemTemplateElement.cpp 8 Feb 2005 22:19:59 -0000 1.25
@@ -309,11 +309,6 @@
executionContext.pushElementFrame(this);
}
- else if (hasDirectTemplate() == true)
- {
- executionContext.pushContextMarker();
- executionContext.pushInvoker(this);
- }
return getFirstChildElemToExecute(executionContext);
}
@@ -1291,6 +1286,9 @@
if (hasDirectTemplate() == true)
{
assert(m_directTemplate != 0);
+
+ executionContext.pushContextMarker();
+ executionContext.pushInvoker(this);
return m_directTemplate;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
