e4919d7c31
Use XPath::Compiler in XML::Querying
2015-08-30 01:22:33 +02:00
5a736aa25c
Removed Compiler#node_literal
2015-08-28 17:00:21 +02:00
4ad4b89860
Revamp compiler specs for "self"
...
This also includes a fix for node() so that it matches attributes.
2015-08-28 16:57:24 +02:00
e8377b360a
Revamp compiler "preceding" specs
...
This also includes some fixes to make this axis behave correctly when
evaluate relative to a document.
2015-08-28 16:49:59 +02:00
6b2874c507
Revamped compiler "preceding-sibling" specs
2015-08-28 16:30:26 +02:00
84a9315b24
Revamped compiler specs for "parent"
2015-08-28 16:22:49 +02:00
07658dadb1
Added Attribute#parent
2015-08-28 16:22:42 +02:00
a1e7d2d07f
Revamp compiler "following" specs
2015-08-28 15:53:57 +02:00
824c897467
Revamp compiler specs for following-sibling
2015-08-28 15:48:03 +02:00
aa3fbcf522
Revamp descendant compiler specs
2015-08-28 15:29:09 +02:00
70bea2071c
Fixed ancestor-or-self relative to attributes
...
Per libxml behaviour this axis shouldn't match attributes when using
"ancestor-or-self::*".
2015-08-27 10:49:32 +02:00
d5aad9c1c9
Revamp descendant-or-self compiler specs
2015-08-27 10:34:25 +02:00
ed31b9f1d3
Revamp compiler specs for the attribute axis
2015-08-26 22:51:04 +02:00
5e3b0a4023
Started updating Compiler for the new XPath AST
...
This also includes fixes for ancestor and ancestor-or-self so that these
axes can be used relative to documents and attributes.
2015-08-26 22:40:00 +02:00
9899a419b7
Added Attribute#each_ancestor
2015-08-26 22:26:46 +02:00
083d048e63
Remove (path) usage from the CSS parser
...
This updates the CSS parser to make it compatible with the XPath AST
changes introduced in commit 365a9e9fa9
2015-08-26 19:15:12 +02:00
365a9e9fa9
Replace (path) nodes with nested nodes
...
This changes the XPath AST so that every segment in a path (e.g.
foo/bar) is parsed as a child node of the node that precedes it. For
example, take the following expression:
foo/bar
This used to be parsed into the following AST:
(path
(axis "child" (test nil "foo"))
(axis "child" (test nil "bar")))
This is now parsed into the following AST:
(axis "child"
(test nil "foo")
(axis "child"
(test nil "bar")))
This new AST is much easier to deal with in the XPath::Compiler class,
especially when trying to ensure that each segment operates on the
correct input.
This commit also fixes parsing of type tests with predicates, such as:
comment()[10]
This used to throw a parser error.
2015-08-26 10:16:48 +02:00
866044f94f
Removed useless block passes in the XPath compiler
2015-08-22 14:28:20 +02:00
c5b30d1eae
Refactor XPath compiler support for predicates
...
Handling of predicates is delegated to 3 different methods:
* on_predicate_direct: for predicates such as foo[bar] and foo[x < y].
* on_predicate_temporary: for predicates that use the last() function
somewhere.
* on_predicate_index: for predicates that only contain a literal index,
foo[10] being an example.
This enables the compiler to use more optimized code depending on the
type of predicate while still being able to support last() and
position().
The code is currently still quite rough on the edges, this will be taken
care of in following commits.
2015-08-20 01:01:30 +02:00
ee44907ca5
Started removing usage of backup_variable
...
This was a hack that never should've made it into the code in the first
place. This breaks some of the CSS specs, but this should be taken care
of when I refactor predicate support.
2015-08-19 20:14:24 +02:00
15ecca4a64
Removed extra throw from following-sibling()
...
I can't quite recall why this throw was present in the Evaluator in the
first place, but removing it doesn't seem to break anything (in the
Evaluator). In fact, removing it actually fixes some of the CSS specs
that were broken when using the Compiler.
2015-08-19 20:14:24 +02:00
d72f5eb07f
Removed left-over assignment
2015-08-19 20:14:24 +02:00
f41f6ff0c8
Only wrap followed_by nodes in begin/end
2015-08-19 20:14:24 +02:00
a661bf8c12
Predicate support for all on_call handlers
2015-08-19 20:14:24 +02:00
a30cdba8d0
Fixed XPath compiler support for not()
2015-08-19 20:14:24 +02:00
7cbc53c64e
XPath compiler support for not() in predicates
2015-08-19 20:14:24 +02:00
0dcee637d3
Added Ruby::Node#if_false
2015-08-19 20:14:24 +02:00
4b50a161ed
Wrap all compiler assignments in begin/end
...
This is much safer than having to explicitly call "wrap" in a potential
large amount of places.
2015-08-19 20:14:24 +02:00
b217aab2cb
XPath compiler support for translate()
2015-08-19 20:14:24 +02:00
106d83e780
XPath compiler support for sum()
2015-08-19 20:14:24 +02:00
e7e5b123cf
XPath compiler support for substring()
2015-08-19 20:14:24 +02:00
32dba554d7
Ruby generator support for Ranges
2015-08-19 20:14:23 +02:00
ec19875530
XPath compiler support for substring-before()
2015-08-19 20:14:23 +02:00
eeab14af4d
XPath compiler support for substring-after()
2015-08-19 20:14:23 +02:00
d6b3461a9a
XPath compiler support for string()
2015-08-19 20:14:23 +02:00
728bd45e48
XPath compiler support for string-length()
2015-08-19 20:14:23 +02:00
0e3451881b
Specs for contains/starts-with in a predicate
2015-08-19 20:14:23 +02:00
37a410a012
XPath compiler support for starts-with()
2015-08-19 20:14:23 +02:00
64d9ecfd53
XPath compiler support for number()
2015-08-19 20:14:23 +02:00
58aa8f0833
Boolean support for Conversion.to_float
2015-08-19 20:14:23 +02:00
43dab548e9
XPath compiler support for not()
2015-08-19 20:14:23 +02:00
2585fbd0b7
XPath compiler support for normalize-space()
2015-08-19 20:14:23 +02:00
e677a5abdf
XPath compiler support for namespace-uri()
2015-08-19 20:14:23 +02:00
9cb589cb34
XPath compiler support for name()
2015-08-19 20:14:23 +02:00
d408989499
Added expanded_name for Element and Attribute
2015-08-19 20:14:23 +02:00
25e2f57a8d
XPath compiler support for local-name()
2015-08-19 20:14:23 +02:00
49a7c2c782
Fixed incorrect spelling of "predicate"
2015-08-19 20:14:23 +02:00
db93f845f3
Renamed on_predicate methods
...
This ensures they all start with "on_predicate".
2015-08-19 20:14:23 +02:00
c026244f6e
XPath compiler support for id() in predicates
2015-08-19 20:14:23 +02:00
49196c285f
XPath compiler support for lang()
2015-08-19 20:14:23 +02:00
eb6cf68140
Tidied up YARD documentation of the XPath compiler
2015-08-19 20:14:23 +02:00
54473d9865
Allow followed_by to take a block
...
This removes the need for a lot of local variables in the Compiler
class, at the cost of some extra indentation levels.
2015-08-19 20:14:22 +02:00
7bcd462e22
XPath compiler support for id()
...
This has been largely ported over from the Evaluator implementation.
2015-08-19 20:14:22 +02:00
2ff1f9ab4f
XPath compiler support for a bucket of functions
...
This includes the following functions:
* boolean()
* ceiling()
* floor()
* round()
* concat()
* contains()
* count()
2015-08-19 20:14:22 +02:00
e3b45fddfc
to_float support for non String values
2015-08-19 20:14:22 +02:00
f3f3c7d31c
Cleaned up literal usage in the XPath compiler
2015-08-19 20:14:22 +02:00
44bd0751bc
Removed commented out code
...
Something something I should just get a decent debugging mode.
2015-08-19 20:14:22 +02:00
e4e777ac4a
XPath compiler support for preceding-sibling
2015-08-19 20:14:22 +02:00
7362a783b8
XPath compiler support for the preceding axis
2015-08-19 20:14:22 +02:00
67bc338474
XPath compiler support for the namespace axis
2015-08-19 20:14:22 +02:00
07b52fb48a
Added Ruby::Node#not
...
This is a shortcut for "!foo". Using this method one doesn't have to
worry about how the "!" operator binds. For example, this:
!foo.or(bar)
would be parsed/evaluated as this:
!(foo.or(bar))
when instead we want it to be this:
(!foo).or(bar)
Using explicit parenthesis leads to ugly code, so now we can do this
instead:
foo.not.or(bar)
2015-08-19 20:14:22 +02:00
4698e98632
XPath compiler support for the following axis
2015-08-19 20:14:22 +02:00
e04ca9be35
XPath compiler Support for following-sibling
...
This is a direct port of the same handler used in the Evaluator class.
The code is a bit rough on the edges but this will be cleaned up in
upcoming commits.
2015-08-19 20:14:22 +02:00
02ee35122a
XPath compiler support for the self axis
2015-08-19 20:14:22 +02:00
bc49af02a2
XPath compiler support for the parent axis
2015-08-19 20:14:22 +02:00
ca7930cbf4
XPath compiler support for "descendant"
2015-08-19 20:14:22 +02:00
f8671a96b7
Fixed compiler support for descendant-or-self
2015-08-19 20:14:22 +02:00
23379d6467
Fixed node() type test for the XPath compiler
...
This ensures the handler behaves the same as in the old XPath evaluator.
2015-08-19 20:14:22 +02:00
8a49d9c0ee
Basic compiler support for descendant-or-self
...
The generated code isn't entirely correct which considering the tests do
pass means the tests need to be fixed too.
2015-08-19 20:14:22 +02:00
d50f89cdf1
Use "node" for axis variables
...
This ensures that any nested code uses the right variables.
2015-08-19 20:14:22 +02:00
045cfe4ab8
XPath compiler support for operators in predicates
...
Previously the operator methods would ignore any blocks set by the
on_predicate family of methods.
2015-08-19 20:14:22 +02:00
aa8386e6f3
Cleaned up compiler handling of axes/calls
...
Function call handlers don't receive a single AST node, instead they
receive the XPath arguments as separate method arguments.
2015-08-19 20:14:21 +02:00
bfc970a95a
XPath compiler support for type tests
2015-08-19 20:14:21 +02:00
ef59f160c7
XPath compiler support for true()/false()
2015-08-19 20:14:21 +02:00
2eb12eced6
XPath compiler support for all operators
...
Some specs still fail due to true()/false() not being implemented but
the operators themselves should work just fine.
2015-08-19 20:14:21 +02:00
3a18d23792
to_boolean support for truthy Ruby values
2015-08-19 20:14:21 +02:00
06ae1503d4
nodes/attributes support in to_compatible_types
...
This extends XPath::Conversion.to_compatible_types so that it can also
take XML::Node and XML::Attribute objects as input.
2015-08-19 20:14:21 +02:00
376d016acd
Expanded supported input for Conversion.to_float
...
This extends XPath::Conversion.to_float so it can also convert NodeSet
and Node instances.
2015-08-19 20:14:21 +02:00
8a82cc3593
XPath compiler support for the "=" operator
2015-08-19 20:14:21 +02:00
04aa8f6546
Ruby generator support for "begin" blocks
2015-08-19 20:14:21 +02:00
92b43a7500
Renamed on_begin to on_followed_by
2015-08-19 20:14:21 +02:00
c98ba21a87
Ruby generator support for mass assignments
2015-08-19 20:14:21 +02:00
53c142ca26
Prefix compiler predicate methods with on_
2015-08-19 20:14:21 +02:00
bea7e19d57
Cast compiled predicate indexes to integers
2015-08-19 20:14:21 +02:00
1f2545c03b
Renamed xpath_number? to number?
2015-08-19 20:14:21 +02:00
0e9f533358
Use return_nodeset? vs USE_NODESET
2015-08-19 20:14:21 +02:00
9000d5efdb
XPath::Compiler#compile specifies blocks for paths
...
Previously the on_path method itself would specify a block to use when a
node was matched. This makes it impossible to customize this behaviour
which is needed when a path is used in an operator or predicate. By
letting the #compile() method specify the block other handlers can
overwrite it.
2015-08-19 20:14:21 +02:00
e549b28ca4
Removed useless YARD docs from the XPath compiler
...
The method names already explain their intent.
2015-08-19 20:14:21 +02:00
20c6bbdaa8
Removed left-over comment in the XPath compiler
2015-08-19 20:14:21 +02:00
616fd42600
XPath compiler support for the "attribute" axis
2015-08-19 20:14:21 +02:00
4f03bf19c1
XPath compiler support for "ancestor"
2015-08-19 20:14:21 +02:00
f96b30fb1f
Tag the XPath compiler as private
2015-08-19 20:14:21 +02:00
f7484f1c8d
Use each_ancestor for ancestor-or-self in XPath
...
The XPath compiler now uses XML::Node#each_ancestor for compiling the
"ancestor-or-self" axis.
2015-08-19 20:14:20 +02:00
52741a3b78
Added XML::Node#each_ancestor
...
This method can be used to walk through the ancestor tree of a Node.
2015-08-19 20:14:20 +02:00
db39b25546
XPath compiler support for ancestor-or-self
...
This also comes with some changes to the specs as the old behaviour of
the Evaluator was incorrect. The Evaluator would bail after matching a
single node but instead it's meant to continue until it runs out of
parent nodes.
2015-08-19 20:14:20 +02:00
d8fbaf75d8
Ruby generator support for while loops
2015-08-19 20:14:20 +02:00
9925b2a9c9
XPath compiler support for predicates
...
This currently supports index predicates (e.g. "foo[10]") and predicates
using paths (e.g. foo[bar/baz]). The usage of boolean operators and more
complex expressions has not yet been tested as these are not yet
supported in the first place.
2015-08-19 20:14:20 +02:00
6f6151fd52
Added Ruby generator support for Symbols
2015-08-19 20:14:20 +02:00
05a57a807e
XPath compiler support for variable references
2015-08-19 20:14:20 +02:00
cf2405998b
Ruby::Generator support for #[] methods
2015-08-19 20:14:20 +02:00
Yorick Peterse