cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler ParameterRef.java ParentLocationPath.java Predicate.java

[morten]

morten      01/09/20 07:35:15

  Modified:    java/src/org/apache/xalan/xsltc/compiler ParameterRef.java
                        ParentLocationPath.java Predicate.java
  Log:
  Removed a change from yesterday that caused a pretty bad regression in
  the position() and last() functions. Also changed a line un Param.java
  to add more information in debug outout.
  PR:           n/a
  Obtained from:        n/a
  Submitted by: [EMAIL PROTECTED]
  Reviewed by:  [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.9       +2 -2      
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
  
  Index: ParameterRef.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ParameterRef.java 2001/09/19 17:54:15     1.8
  +++ ParameterRef.java 2001/09/20 14:35:15     1.9
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: ParameterRef.java,v 1.8 2001/09/19 17:54:15 morten Exp $
  + * @(#)$Id: ParameterRef.java,v 1.9 2001/09/20 14:35:15 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -76,7 +76,7 @@
       }
   
       public String toString() {
  -     return "parameter-ref(" + _variable.getName() + ')';
  +     return "parameter-ref("+_variable.getName()+'/'+_variable.getType()+')';
       }
   
       public void translate(ClassGenerator classGen, MethodGenerator 
methodGen) {
  
  
  
  1.7       +1 -2      
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
  
  Index: ParentLocationPath.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ParentLocationPath.java   2001/09/17 08:20:54     1.6
  +++ ParentLocationPath.java   2001/09/20 14:35:15     1.7
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: ParentLocationPath.java,v 1.6 2001/09/17 08:20:54 morten Exp $
  + * @(#)$Id: ParentLocationPath.java,v 1.7 2001/09/20 14:35:15 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -140,7 +140,6 @@
        // Compile path iterator
        _path.translate(classGen, methodGen); // iterator on stack....
        _step.translate(classGen, methodGen);
  -
   
        // Initialize StepIterator with iterators from the stack
        il.append(new INVOKESPECIAL(initSI));
  
  
  
  1.14      +1 -7      
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Predicate.java
  
  Index: Predicate.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Predicate.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Predicate.java    2001/09/19 17:54:15     1.13
  +++ Predicate.java    2001/09/20 14:35:15     1.14
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: Predicate.java,v 1.13 2001/09/19 17:54:15 morten Exp $
  + * @(#)$Id: Predicate.java,v 1.14 2001/09/20 14:35:15 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -94,12 +94,6 @@
       }
   
       public boolean isNthPositionFilter() {
  -     if (_exp instanceof EqualityExpr) {
  -         EqualityExpr eq = (EqualityExpr)_exp;
  -         if ((eq.getLeft() instanceof PositionCall) &&
  -             (eq.getRight() instanceof IntExpr))
  -             _nthPositionFilter = true;
  -     }
        return _nthPositionFilter;
       }
       
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]