cvs commit: xml-xalan/java/src/org/apache/xpath VariableStack.java

[sboag]

sboag       00/12/20 17:38:00

  Modified:    java/src/org/apache/xpath VariableStack.java
  Log:
  Changed getParamVariable to getParamArg.
  
  Revision  Changes    Path
  1.17      +7 -16     xml-xalan/java/src/org/apache/xpath/VariableStack.java
  
  Index: VariableStack.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/VariableStack.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- VariableStack.java        2000/12/20 05:00:34     1.16
  +++ VariableStack.java        2000/12/21 01:38:00     1.17
  @@ -338,16 +338,15 @@
   
   
     /**
  -   * Same as getVariable, except don't look in the
  -   * global space.
  +   * Get the variable argument.
      *
      * @param qname The qualified name of the variable.
      *
  -   * @return The wrapped value of the variable.
  +   * @return the argument object.
      *
      * @throws TransformerException
      */
  -  public XObject getParamVariable(XPathContext xctxt, QName qname) throws 
TransformerException
  +  public Arg getParamArg(QName qname) throws TransformerException
     {
   
       XObject val = null;
  @@ -357,21 +356,13 @@
       {
         Arg arg = (Arg)frame.elementAt(i);
   
  -      if (arg.getQName().equals(qname))
  +      if (arg.getQName().equals(qname) && arg.isParamVar())
         {
  -        val = arg.getVal();
  -        
  -        if(val.getType() == XObject.CLASS_UNRESOLVEDVARIABLE)
  -        {
  -          val = val.execute(xctxt);
  -          arg.setVal(val);
  -        }
  -
  -        break;
  +        return arg;
         }
       }
   
  -    return val;
  +    return null;
     }
   
     /**
  @@ -393,7 +384,7 @@
       {
         Arg arg = (Arg)frame.elementAt(i);
   
  -      if (arg.getQName().equals(name))
  +      if (arg.getQName().equals(name) && !arg.isParamVar())
         {
           XObject val = arg.getVal();
           if(val.getType() == XObject.CLASS_UNRESOLVEDVARIABLE)