Skip to content

Remove keyword duplication in named arguments #39

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

Merged
abhro merged 1 commit into from
Jul 11, 2026
+15 −18
Merged

Remove keyword duplication in named arguments #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions src/card.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,12 @@ function Card(key::S = "", value::V = missing, comment::S = ""; fixed::B = true,
elseif is_continue_key(upkey) && is_string(value)
# Create CONTINUE card
type = Continue
format = formatcard(type, value, comment; append = append, fixed = fixed,
slash = slash, lpad = lpad, rpad = rpad, upad = upad)
format = formatcard(type, value, comment; append, fixed,
slash, lpad, rpad, upad)
elseif is_comment_key(upkey)
# Create COMMENT card
if typeof(value) <: Union{AbstractString, Missing}
type = COMMENTKEY[upkey]
value = value
format = CardFormat(fixed, (!ismissing(value) ?
(1, length(value)) : (0, 0))...)
else
Expand All @@ -286,21 +285,21 @@ function Card(key::S = "", value::V = missing, comment::S = ""; fixed::B = true,
elseif is_valid_key(upkey) && !(typeof(value) <: AbstractString)
# Create Value card
type = Value{typeof(value)}
format = formatcard(type, value, comment; fixed = fixed, append = append,
slash = slash, lpad = lpad, rpad = rpad, upad = upad, truncate = truncate)
format = formatcard(type, value, comment; fixed, append,
slash, lpad, rpad, upad, truncate)
elseif is_valid_key(upkey) && is_long_string(String(value), comment, slash, lpad,
rpad, truncate)
# Create a list of cards from from a long string.
type = Value{typeof(value)}
cards = split_card(upkey, value, comment, (; fixed = fixed,
slash = slash, lpad = lpad, rpad = rpad, upad = upad, append = append))
cards = split_card(upkey, value, comment,
(; fixed, slash, lpad, rpad, upad, append))
cards = [Card(t, k, v, c, f) for (t, k, v, c, f) in cards]
elseif is_valid_key(upkey)
# Create Value card that is not a long string.
type = Value{typeof(value)}
value = format_xtension_value(upkey, value)
format = formatcard(type, value, comment; fixed = fixed, append = append,
slash = slash, lpad = lpad, rpad = rpad, upad = upad, truncate = truncate)
format = formatcard(type, value, comment; fixed, append,
slash, lpad, rpad, upad, truncate)
else
error("Invalid card")
end
Expand Down Expand Up @@ -336,8 +335,7 @@ function Card(key::S, tokens::S, value::V, comment::S;

if is_hierarch(upkey) && is_valid_key(upkey)
type = Hierarch{typeof(value)}
format = formatcard(type, uptoken, value, comment; fixed = fixed, slash = slash,
lpad = lpad, rpad = rpad, upad = upad)
format = formatcard(type, uptoken, value, comment; fixed, slash, lpad, rpad, upad)
else
error("Invalid card")
end
Expand All @@ -354,7 +352,7 @@ function setvalue!(card::Card, value::ValueType)
end
Card(type, card.key, value, card.comment,
formatcard(type, value, card.comment;
fixed = f.fixd, slash = f.slsh, lpad = lpad, rpad = rpad, upad = upad))
fixed = f.fixd, slash = f.slsh, lpad, rpad, upad))
end

# check key type
Expand Down Expand Up @@ -471,7 +469,7 @@ function formatcard(::Type{Value{V}}, value::V, comment::C; kwds...) where
format.vbeg, format.vend = Int8(max(1, FIXEDINDEX-vlen+1)), Int8(vend)
# format.frmt = fmt
# Format comment, if necessary
formatcomment!(comment, vend, format; units = units, kwds...)
formatcomment!(comment, vend, format; units, kwds...)
end

function formatcard(::Type{Value{V}}, value::V, comment::C; kwds...) where
Expand All @@ -485,7 +483,7 @@ function formatcard(::Type{Value{V}}, value::V, comment::C; kwds...) where
format.vbeg, format.vend = Int8.((2, 2+rlen+2)), Int8.((1+rlen+2, vend))
# format.frmt = fmt
# Format comment, if necessary
formatcomment!(comment, vend, format; units = units, kwds...)
formatcomment!(comment, vend, format; units, kwds...)
end

function formatcard(::Type{Continue}, value::S, comment::C; kwds...) where
Expand Down
5 changes: 2 additions & 3 deletions src/hdu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,9 @@ function HDU(data::D = missing, cards::C = missing; record::B = false,

kwds = (;
# data formatting options
record = record, scale = scale,
record, scale,
# card formatting options
append = append, fixed = fixed, slash = slash, lpad = lpad, rpad = rpad,
upad = upad, truncate = truncate)
append, fixed, slash, lpad, rpad, upad, truncate)

kards = ismissing(cards) ? Card[] : copy(cards)

Expand Down
2 changes: 1 addition & 1 deletion test/test_hroundtrip.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using .HDecompress
function compress_image(original::AbstractArray{<:Integer}, scale::Integer=2)
output = Vector{UInt8}(undef, length(original) * 32)
nbytes = Ref{Integer}(length(output))
stat, encoded = HCompress.encode(HCompress.HComp, original, scale; output = output, nbytes = nbytes)
stat, encoded = HCompress.encode(HCompress.HComp, original, scale; output, nbytes)
return stat, encoded[1:nbytes[]], nbytes[]
end

Expand Down
Loading