You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mo...@apache.org on 2001/11/21 12:38:20 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler ApplyTemplates.java

morten      01/11/21 03:38:20

  Modified:    java/src/org/apache/xalan/xsltc/compiler ApplyTemplates.java
  Log:
  Fix for a bug caused by <xsl:apply-templates/> not always passing parameters to
  the invoked template(s). Parameters would not be put on the stack if the
  'select' attribute contained wildcards.
  PR:		bugzilla 4718
  Obtained from:	n/a
  Submitted by:	morten@xml.apache.org
  Reviewed by:	morten@xml.apache.org
  
  Revision  Changes    Path
  1.10      +3 -3      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
  
  Index: ApplyTemplates.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApplyTemplates.java	2001/11/21 10:52:54	1.9
  +++ ApplyTemplates.java	2001/11/21 11:38:20	1.10
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: ApplyTemplates.java,v 1.9 2001/11/21 10:52:54 morten Exp $
  + * @(#)$Id: ApplyTemplates.java,v 1.10 2001/11/21 11:38:20 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -155,7 +155,7 @@
   	}
   
   	// Push a new parameter frame
  -	if (stylesheet.hasLocalParams()) {
  +	if (stylesheet.hasLocalParams() || hasContents()) {
   	    il.append(classGen.loadTranslet());
   	    final int pushFrame = cpg.addMethodref(TRANSLET_CLASS,
   						   PUSH_PARAM_FRAME,
  @@ -215,7 +215,7 @@
   	il.append(new INVOKEVIRTUAL(applyTemplates));
   	
   	// Pop parameter frame
  -	if (stylesheet.hasLocalParams()) {
  +	if (stylesheet.hasLocalParams() || hasContents()) {
   	    il.append(classGen.loadTranslet());
   	    final int popFrame = cpg.addMethodref(TRANSLET_CLASS,
   						  POP_PARAM_FRAME,
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org