Skip to content

Primitive value should't be wrapped in an array #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tompng wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −8
Open

Primitive value should't be wrapped in an array #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb1633e
Primitive value should't be wrapped in an array
tompng Jun 5, 2026
542bd9d
Remove workaround to handle primitive value wrapped in array
tompng Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/rexml/functions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,17 @@ def Functions::local_name(node_set=nil)
end

def Functions::namespace_uri( node_set=nil )
get_namespace( node_set ) {|node| node.namespace}
get_namespace( node_set ) do |node|
return node.namespace
end
""
Comment on lines +77 to +80
end

def Functions::name( node_set=nil )
get_namespace( node_set ) do |node|
node.expanded_name
return node.expanded_name
end
""
end

# Helper method.
Expand Down
9 changes: 3 additions & 6 deletions lib/rexml/xpath_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def expr( path_stack, nodeset, context=nil )
end
when :variable
var_name = path_stack.shift
return [@variables[var_name]]
return @variables[var_name]

when :eq, :neq, :lt, :lteq, :gt, :gteq
left = expr( path_stack.shift, nodeset.dup, context )
Expand Down Expand Up @@ -618,16 +618,13 @@ def evaluate_predicate(expression, nodesets)
end
result = expr(expression.dclone, [node], subcontext)
trace(:predicate_evaluate, expression, node, subcontext, result) if @debug
result = result[0] if result.kind_of? Array and result.length == 1
if result.kind_of? Numeric
if result == node.position
new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
end
elsif result.instance_of? Array
if result.size > 0 and result.inject(false) {|k,s| s or k}
if result.size > 0
new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
end
if result.size > 0
new_nodeset << XPathNode.new(node, position: new_nodeset.size + 1)
end
else
if result
Expand Down
Loading