You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/12/20 06:02:22 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemApplyTemplates.java ElemCallTemplate.java
sboag 00/12/19 21:02:22
Modified: java/src/org/apache/xalan/templates ElemApplyTemplates.java
ElemCallTemplate.java
Log:
Modified Myriams setting of searchStart a bit, so the nested variables at
inside a variable at the top level work now.
Revision Changes Path
1.10 +3 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java
Index: ElemApplyTemplates.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemApplyTemplates.java 2000/12/19 22:37:04 1.9
+++ ElemApplyTemplates.java 2000/12/20 05:02:21 1.10
@@ -239,11 +239,12 @@
if (null != m_paramElems)
{
transformer.pushParams(xctxt, this, sourceNode, mode);
- vars.setSearchStart(-1);
- }
+ }
else
vars.pushContextMarker();
+ vars.setSearchStart(-1);
+
return savedSearchStart;
}
1.12 +2 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java
Index: ElemCallTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemCallTemplate.java 2000/12/19 22:37:04 1.11
+++ ElemCallTemplate.java 2000/12/20 05:02:22 1.12
@@ -170,12 +170,13 @@
XPathContext xctxt = transformer.getXPathContext();
VariableStack vars = xctxt.getVarStack();
+ int savedSearchStart = vars.getSearchStart();
+
if (null != m_paramElems)
transformer.pushParams(xctxt, this, sourceNode, mode);
else
vars.pushContextMarker();
- int savedSearchStart = vars.getSearchStart();
vars.setSearchStart(-1);
SourceLocator savedLocator = xctxt.getSAXLocator();