core
/
oga
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unfuck XPath axes evaluation. 

The evaluation of axes has been fixed by changing the initial context as well as
the behaviour of some of the handler methods.

The initial context has been changed so that it's simply a NodeSet of whatever
the root object is, either a Document or an Element instance. Previously this
would be set to the child nodes of a Document in case the root object was a
Document. This in turn would prevent "child" axes from operating correctly.
This commit is contained in:
Yorick Peterse 2014-07-28 00:44:05 +02:00
parent 28f77b6d9b
commit 55e3388e30
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/oga/xpath/evaluator.rb
View File

@ -24,13 +24,8 @@ module Oga
# @return [Oga::XML::Node] # @return [Oga::XML::Node]
# #
def evaluate(string) def evaluate(string)
ast = Parser.new(string).parse ast = Parser.new(string).parse
context = XML::NodeSet.new([@document])
if @document.is_a?(XML::Document)
context = @document.children
else
context = XML::NodeSet.new([@document])
end
return process(ast, context) return process(ast, context)
end end
@ -79,16 +74,15 @@ module Oga
# @return [Oga::XML::NodeSet] # @return [Oga::XML::NodeSet]
# #
def on_path(node, context) def on_path(node, context)
last_node = node.children[-1] nodes = XML::NodeSet.new
nodes = XML::NodeSet.new
node.children.each do |test| node.children.each do |test|
nodes = process(test, context) nodes = process(test, context)
if test != last_node and !nodes.empty? if nodes.empty?
context = child_nodes(context)
elsif nodes.empty?
break break
else
context = nodes
end end
end end
@ -214,7 +208,7 @@ module Oga
# @return [Oga::XML::NodeSet] # @return [Oga::XML::NodeSet]
# #
def on_axis_child(node, context) def on_axis_child(node, context)
return on_test(node, context) return on_test(node, child_nodes(context))
end end
## ##
@ -226,11 +220,11 @@ module Oga
# @return [Oga::XML::NodeSet] # @return [Oga::XML::NodeSet]
# #
def on_axis_descendant(node, context) def on_axis_descendant(node, context)
nodes = XML::NodeSet.new nodes = XML::NodeSet.new
children = child_nodes(context)
unless children.empty? context.each do |context_node|
nodes += on_axis_descendant(node, children) nodes += on_test(node, context_node.children)
nodes += on_axis_descendant(node, context_node.children)
end end
return nodes return nodes
@ -244,14 +238,7 @@ module Oga
# @return [Oga::XML::NodeSet] # @return [Oga::XML::NodeSet]
# #
def on_axis_descendant_or_self(node, context) def on_axis_descendant_or_self(node, context)
nodes = on_test(node, context) return on_test(node, context) + on_axis_descendant(node, context)
children = child_nodes(context)
unless children.empty?
nodes += on_axis_descendant(node, children)
end
return nodes
end end
## ##
@ -265,9 +252,7 @@ module Oga
children = XML::NodeSet.new children = XML::NodeSet.new
nodes.each do |xml_node| nodes.each do |xml_node|
xml_node.children.each do |child| children += xml_node.children
children << child
end
end end
return children return children