You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by tm...@apache.org on 2002/10/18 22:07:34 UTC

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

tmiller     2002/10/18 13:07:34

  Modified:    java/src/org/apache/xalan/xsltc/compiler Step.java
  Log:
  bug fix 12308, typeCheck, nodeset to node optimization is turned off if node has context
  
  Revision  Changes    Path
  1.39      +6 -3      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java
  
  Index: Step.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Step.java	8 Oct 2002 21:44:13 -0000	1.38
  +++ Step.java	18 Oct 2002 20:07:34 -0000	1.39
  @@ -215,9 +215,12 @@
   	// combinations of steps and patterns than can be optimised
   	_hadPredicates = hasPredicates();
   
  -	// Special case for '.' 
  +	// Special case for '.'
  + 	//   in the case where '.' has a context such as book/. 
  +	//   or .[false()] we can not optimize the nodeset to a single node. 
   	if (isAbbreviatedDot()) {
  -	    _type =  (hasParentPattern()) ? Type.NodeSet : Type.Node;
  +	    _type =  (hasParentPattern() || hasPredicates() ) ? 
  +		Type.NodeSet : Type.Node;
   	}
   	else {
   	    _type = Type.NodeSet;
  
  
  

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