You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sa...@apache.org on 2002/09/15 16:26:36 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/dom AbsoluteIterator.java

santiagopg    2002/09/15 07:26:36

  Modified:    java/src/org/apache/xalan/xsltc/compiler xpath.cup
               java/src/org/apache/xalan/xsltc/dom AbsoluteIterator.java
  Log:
  Optimized evaluation of //RelativeLocationPath expressions.
  
  Revision  Changes    Path
  1.41      +3 -5      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/xpath.cup
  
  Index: xpath.cup
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/xpath.cup,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- xpath.cup	30 Aug 2002 14:49:41 -0000	1.40
  +++ xpath.cup	15 Sep 2002 14:26:36 -0000	1.41
  @@ -612,10 +612,8 @@
   AbbreviatedAbsoluteLocationPath ::= DSLASH RelativeLocationPath:rlp
           {:
   	    final Step step = new Step(Axis.DESCENDANTORSELF, -1, null);
  -
  -	    RESULT = new FilteredAbsoluteLocationPath(
  -			new AbsoluteLocationPath(parser.insertStep(step, 
  -				(RelativeLocationPath) rlp)));
  +	    RESULT = new AbsoluteLocationPath(parser.insertStep(step, 
  +				(RelativeLocationPath) rlp));
   	:};
   
   Step ::= NodeTest:ntest
  
  
  
  1.8       +3 -2      xml-xalan/java/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
  
  Index: AbsoluteIterator.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbsoluteIterator.java	25 Jul 2002 11:45:28 -0000	1.7
  +++ AbsoluteIterator.java	15 Sep 2002 14:26:36 -0000	1.8
  @@ -92,7 +92,8 @@
   	_startNode = _mask | DOM.ROOTNODE;
   	if (_isRestartable) {
   	    resetPosition();
  -	    return _source.setStartNode(_startNode = _mask | DOM.ROOTNODE);
  +	    _source.setStartNode(_startNode);
  +	    return this;
   	}
   	return reset();
       }
  
  
  

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