265460 - Make XPath evaluation use context size and position

Status: RESOLVED FIXED

(Core Graveyard :: XForms, defect)

Description

[Allan Beaufour]

Right now, XPath expressions are evaluated with context size and position == 1.
We need to fix that so the right values are used. Transformiix has support for it.

Comment 1

[Allan Beaufour]

I've created a Transformiix bug (bug 292841) for adding context size and
position to the XPath expressions.

Comment 2

[Allan Beaufour]

Attachment: testcase for bind

Comment 3

[Allan Beaufour]

Attachment: testcase for repeat

Comment 4

[Allan Beaufour]

Attachment: Rough patch

Here's a rough patch for it. Rough == haven't looked it through, but it seems
to work :)

Comment 5

[Allan Beaufour]

Attachment: Polished patch

Bug 292841 is ready for check in, so here's a patch for xforms that uses the
new evaluate function.

Comment 6

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 184912 [details] [diff] [review]
Polished patch


>   
>   /// @todo Use aNode->contextPosition and aNode->contextSize (XXX)
>   /// @see https://bugzilla.mozilla.org/show_bug.cgi?id=265460

Shouldn't you remove this comment now?

>   nsISupports* retval;
>   nsresult rv;
> 
>-  rv = aNode->mExpression->Evaluate(aNode->mContextNode,
>-                                    nsIDOMXPathResult::BOOLEAN_TYPE,
>-                                    nsnull,
>-                                    &retval);
>+  rv = aNode->mExpression->EvaluateWithContext(aNode->mContextNode,
>+                                               aNode->mContextPosition,
>+                                               aNode->mContextSize,
>+                                               nsIDOMXPathResult::BOOLEAN_TYPE,
>+                                               nsnull,
>+                                               &retval);
>   NS_ENSURE_SUCCESS(rv, rv);

Comment 7

[Allan Beaufour]

Comment on attachment 184912 [details] [diff] [review]
Polished patch

(In reply to comment #6)
> (From update of attachment 184912 [details] [diff] [review] [edit])
> >   
> >   /// @todo Use aNode->contextPosition and aNode->contextSize (XXX)
> >   /// @see https://bugzilla.mozilla.org/show_bug.cgi?id=265460
> 
> Shouldn't you remove this comment now?

Indeed.

Doron, will you do second r?

Comment 8

[Allan Beaufour]

Checked in.