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

rexml: Fix a XPath bug that white spaces aren't ignored

Browse source 
lib/rexml/parsers/xpathparser.rb: Ignore white spaces in relative
location path.

test/rexml/xpath/test_base.rb: Add more test patterns and use more
debug friendly assertion style.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2018-04-19 21:34:40 +00:00
parent 632e10cad3
commit 9090241e61
2 changed files with 58 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lib/rexml/parsers/xpathparser.rb
View file

@ -185,7 +185,7 @@ module REXML
# | '/' RelativeLocationPath?
# | '//' RelativeLocationPath
def LocationPath path, parsed
path = path.strip
path = path.lstrip
if path[0] == ?/
parsed << :document
if path[1] == ?/
@ -209,7 +209,12 @@ module REXML
# | RelativeLocationPath '//' Step
AXIS = /^(ancestor|ancestor-or-self|attribute|child|descendant|descendant-or-self|following|following-sibling|namespace|parent|preceding|preceding-sibling|self)::/
def RelativeLocationPath path, parsed
while path.size > 0
loop do
original_path = path
path = path.lstrip
return original_path if path.empty?
# (axis or @ or <child::>) nodetest predicate >
# OR > / Step
# (. or ..) >
@ -239,28 +244,25 @@ module REXML
n = []
path = NodeTest( path, n)
if path[0] == ?[
path = Predicate( path, n )
end
path = Predicate( path, n )
parsed.concat(n)
end
if path.size > 0
if path[0] == ?/
if path[1] == ?/
parsed << :descendant_or_self
parsed << :node
path = path[2..-1]
else
path = path[1..-1]
end
else
return path
end
original_path = path
path = path.lstrip
return original_path if path.empty?
return original_path if path[0] != ?/
if path[1] == ?/
parsed << :descendant_or_self
parsed << :node
path = path[2..-1]
else
path = path[1..-1]
end
end
return path
end
# Returns a 1-1 map of the nodeset
@ -277,6 +279,8 @@ module REXML
NODE_TYPE = /^(comment|text|node)\(\s*\)/m
PI = /^processing-instruction\(/
def NodeTest path, parsed
original_path = path
path = path.lstrip
case path
when /^\*/
path = $'
@ -310,13 +314,17 @@ module REXML
parsed << :qname
parsed << prefix
parsed << name
else
path = original_path
end
return path
end
# Filters the supplied nodeset on the predicate(s)
def Predicate path, parsed
return nil unless path[0] == ?[
original_path = path
path = path.lstrip
return original_path unless path[0] == ?[
predicates = []
while path[0] == ?[
path, expr = get_group(path)
@ -509,8 +517,7 @@ module REXML
#| LocationPath
#| FilterExpr ('/' | '//') RelativeLocationPath
def PathExpr path, parsed
path =~ /^\s*/
path = $'
path = path.lstrip
n = []
rest = FilterExpr( path, n )
if rest != path
@ -530,7 +537,7 @@ module REXML
def FilterExpr path, parsed
n = []
path = PrimaryExpr( path, n )
path = Predicate(path, n) if path and path[0] == ?[
path = Predicate(path, n)
parsed.concat(n)
path
end