Saxon

SourceForge user: mhkay

Logged In: YES

user_id=251681

The above patch is incorrect. It creates a new stack frame

for the evaluated expression but doesn't reset the context

correctly on exit. Here's an improved version:

/**

* Evaluate in a general context

*/


public Item evaluateItem(XPathContext c) throws 

XPathException {

    PreparedExpression pexpr = prepareExpression(c);


    if (operation == EXPRESSION) {

        return new ObjectValue(pexpr);

    } else {

        for (int i=1; i<getNumberOfArguments(); i++) {

            pexpr.variables[i-1].setXPathValue

(ExpressionTool.eagerEvaluate(argument[i],c));

        }

        c.getController().getBindery().openStackFrame();

        XPathContext c2 = c.getController

().newXPathContext();

        Item result = pexpr.expression.evaluateItem(c2);

        c.getController().getBindery().closeStackFrame();

        return result;

    }

}


/**

* Iterate over the results of the function

*/


public SequenceIterator iterate(XPathContext c) throws 

XPathException {

    PreparedExpression pexpr = prepareExpression(c);


    if (operation == EXPRESSION) {

        return SingletonIterator.makeIterator(new 

ObjectValue(pexpr));

    } else {

        for (int i=1; i<getNumberOfArguments(); i++) {

            pexpr.variables[i-1].setXPathValue

(ExpressionTool.eagerEvaluate(argument[i],c));

        }

        c.getController().getBindery().openStackFrame();

        XPathContext c2 = c.getController

().newXPathContext();

        SequenceIterator result = pexpr.expression.iterate

(c2);

        c.getController().getBindery().closeStackFrame();

        return result;

    }

}

SourceForge user: mhkay

Logged In: YES

user_id=251681

Further testing reveals that this fix still isn't quite right. In

both methods the line

XPathContext c2 = c.getController

().newXPathContext();

should be

XPathContext c2 = c.newContext();

Michael Kay