delta/fpc.git/packages/fcl-xml/src/xpath.pp, branch avr

XPath: now when predicate filtering is no longer dependent on axis, it becomes possible to use the same code for TStep and TXPathFilterNode. Inherited TStep from TXPathFilterNode, removed duplicating code.

2010-07-28T15:25:19+00:00

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15654 3ad0048d-3df7-0310-abae-a5850022a9f2

XPath: reworked step processing:

2010-07-28T14:25:08+00:00

* For ancestor and ancestor-or-self axes, added checks for attribute nodes similar to parent axis.
* For reverse axes, collect and filter nodes in 'natural' (i.e. reversed) order, and only then reverse order while adding to result node set. This is much simpler to implement.
* Fixed memory leak (not destroying TXPathFilterNode.FExpr)


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15652 3ad0048d-3df7-0310-abae-a5850022a9f2

* XPath, change parsing of function call so that function arguments are parsed before creating the function node. This way function nodes can validate their arguments at creation time.

2010-07-26T19:30:26+00:00

* also changed function argument container type from TFPList to dynamic array.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15641 3ad0048d-3df7-0310-abae-a5850022a9f2

* XPath, fixed parsing of 'prefix:*' node tests:

2010-07-26T16:35:35+00:00

  o The prefix to resolve should not include following ':*' characters
  o NextToken changes CurTokenString, so NextToken must be after reading CurTokenString.
  o Added a test for that
* XPath test suite, fixed comparison of numeric result (it is quite tricky in presence of NaNs).


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15639 3ad0048d-3df7-0310-abae-a5850022a9f2

XPath, use a perfect hash to recognize all possible keywords.

2010-07-26T13:49:46+00:00

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15638 3ad0048d-3df7-0310-abae-a5850022a9f2

XPath improvements:

2010-07-24T23:15:35+00:00

- Deleted TXPathLocationPathNode, it was too much overhead to store a single bit of information. The path root (if any) is now represented by TStep node with Axis=axisRoot.
* Changed TStep linkage from 'right' to 'left', this is consistent with the way of parsing  expressions and considerably simplifies evaluation.
* Fixed ParsePathExpr procedure so it no longer accepts empty/truncated expressions.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15632 3ad0048d-3df7-0310-abae-a5850022a9f2

* TXPathScanner.ParseStep split into two functions in order to reduce complexity and improve readability.

2010-07-24T03:21:40+00:00

* Also modified it so the data is accumulated in local vars, and resulting TStep objects are created only after the parsing is successfully complete.
* TXPathScanner.ParsePrimaryExpr: eliminated variable.


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15628 3ad0048d-3df7-0310-abae-a5850022a9f2

* XPath, fixed parent axis of attribute nodes: it must consist of the owner element of an attribute.

2010-06-14T21:15:53+00:00

+ Tests


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15439 3ad0048d-3df7-0310-abae-a5850022a9f2

* Fixed XPath functions name() and local-name(), which should behave different from DOM properties of the same names. name() is empty for text, comment and document nodes. local-name() is the same as name() for non-prefixed attributes and processing instructions.

2010-06-14T17:21:35+00:00

+ Another dozen of tests.


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15438 3ad0048d-3df7-0310-abae-a5850022a9f2

xpath.pp:

2009-10-20T22:13:13+00:00

* text() selector matches text and CDATA nodes, but not comments
* Names of processing instructions are now matched as they should.


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13915 3ad0048d-3df7-0310-abae-a5850022a9f2