1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/rexml: 1.9 patch from Sam Ruby mentioned in his blog:

<http://intertwingly.net/blog/2007/12/31/Porting-REXML-to-Ruby-1-9>
  [ruby-core:14639]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-01-01 05:43:50 +00:00
parent 96e7713754
commit 1448668244
16 changed files with 91 additions and 67 deletions

View file

@ -222,7 +222,7 @@ module REXML
when :child
new_nodeset = []
nt = nil
for node in nodeset
nodeset.each do |node|
nt = node.node_type
new_nodeset += node.children if nt == :element or nt == :document
end
@ -266,7 +266,7 @@ module REXML
when :ancestor
new_nodeset = []
for node in nodeset
nodeset.each do |node|
while node.parent
node = node.parent
new_nodeset << node unless new_nodeset.include? node
@ -277,7 +277,7 @@ module REXML
when :ancestor_or_self
new_nodeset = []
for node in nodeset
nodeset.each do |node|
if node.node_type == :element
new_nodeset << node
while ( node.parent )
@ -341,7 +341,7 @@ module REXML
when :descendant
results = []
nt = nil
for node in nodeset
nodeset.each do |node|
nt = node.node_type
results += expr( path_stack.dclone.unshift( :descendant_or_self ),
node.children ) if nt == :element or nt == :document
@ -376,7 +376,7 @@ module REXML
when :preceding
new_nodeset = []
for node in nodeset
nodeset.each do |node|
new_nodeset += preceding( node )
end
#puts "NEW NODESET => #{new_nodeset.inspect}"
@ -385,7 +385,7 @@ module REXML
when :following
new_nodeset = []
for node in nodeset
nodeset.each do |node|
new_nodeset += following( node )
end
nodeset = new_nodeset
@ -395,7 +395,7 @@ module REXML
#puts "In :namespace"
new_nodeset = []
prefix = path_stack.shift
for node in nodeset
nodeset.each do |node|
if (node.node_type == :element or node.node_type == :attribute)
if @namespaces
namespaces = @namespaces