Skip to content

Ensure XML.attributes(node) === nothing when node has no attributes #34

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

Closed
wants to merge 2 commits into from
Closed

Ensure XML.attributes(node) === nothing when node has no attributes #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a434793
Ensure `XML.attributes(node) === nothing` when `node` has no attributes
TimG1964 Feb 12, 2025
6ca1710
Update XML.jl
TimG1964 Feb 14, 2025
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
13 changes: 10 additions & 3 deletions src/XML.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ Node(data::Raw) = Node(LazyNode(data))
# Anything that's not Vector{UInt8} or a (Lazy)Node is converted to a Text Node
Node(x) = Node(Text, nothing, nothing, string(x), nothing)

h(tag::Union{Symbol, String}, children...; kw...) = Node(Element, tag, kw, nothing, children)
h(tag::Union{Symbol, String}, children...; kw...) = Node(Element, tag, length(kw)==0 ? nothing : kw, nothing, children)
# h(tag::Union{Symbol, String}, children...; kw...) = Node(Element, tag, kw, nothing, children)
Base.getproperty(::typeof(h), tag::Symbol) = h(tag)
(o::Node)(children...; kw...) = Node(o, Node.(children)...; kw...)

Expand Down Expand Up @@ -204,7 +205,12 @@ Base.setindex!(o::Node, val, i::Integer) = o.children[i] = Node(val)
Base.push!(a::Node, b::Node) = push!(a.children, b)
Base.pushfirst!(a::Node, b::Node) = pushfirst!(a.children, b)

Base.setindex!(o::Node, val, key::AbstractString) = (o.attributes[key] = string(val))
function Base.setindex!(o::Node, val, key::AbstractString) # Need to deal with case that XML.attributes(o) === nothing
o = isnothing(o.attributes) ? XML.Node(o.nodetype, o.tag, OrderedDict{String, String}(), o.value, o.children) : o
o.attributes[key] = string(val)
return o
end
# Base.setindex!(o::Node, val, key::AbstractString) = (o.attributes[key] = string(val))
Base.getindex(o::Node, val::AbstractString) = o.attributes[val]
Base.haskey(o::Node, key::AbstractString) = isnothing(o.attributes) ? false : haskey(o.attributes, key)
Base.keys(o::Node) = isnothing(o.attributes) ? () : keys(o.attributes)
Expand Down Expand Up @@ -240,7 +246,8 @@ function (T::NodeType)(args...; attr...)
Node(T, nothing, nothing, only(args))
elseif T === Element
tag = first(args)
Node(T, tag, attr, nothing, args[2:end])
Node(T, tag, length(attr)==0 ? nothing : attr, nothing, args[2:end])
# Node(T, tag, attr, nothing, args[2:end])
else
error("Unreachable reached while trying to create a Node via (::NodeType)(args...; kw...).")
end
Expand Down
Loading