Skip to content

Fix parsing bug that could result a double -E #1528

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
merged 1 commit into from
Sep 16, 2024
Merged

Fix parsing bug that could result a double -E #1528

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
8 changes: 4 additions & 4 deletions src/blocks.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function blockmean_helper(cmd0::String, arg1; kwargs...)

d = KW(kwargs)
help_show_options(d) # Check if user wants ONLY the HELP mode
cmd = parse_these_opts("", d, [[:S :statistic]])
cmd = parse_these_opts("", d, [[:E :extend :extended], [:S :statistic]])
if (find_in_dict(d, [:npts :count])[1] !== nothing) cmd = " -Sn"
elseif (find_in_dict(d, [:mean])[1] !== nothing) cmd = " -Sm"
elseif (find_in_dict(d, [:sum])[1] !== nothing) cmd = " -Ss"
Expand Down Expand Up @@ -102,7 +102,7 @@ function blockmedian_helper(cmd0::String, arg1; kwargs...)

d = KW(kwargs)
help_show_options(d) # Check if user wants ONLY the HELP mode
cmd = parse_these_opts("", d, [[:Q :quick], [:T :quantile]])
cmd = parse_these_opts("", d, [[:E :extend :extended], [:Q :quick], [:T :quantile]])
opt_A = add_opt(d, "", "A", [:A :field :fields], (median="_z", scale="_s", highest="_h", lowest="_l", weight="_w", weights="_w"))
(!occursin(" -E", cmd) && (occursin("s", opt_A) || occursin("h", opt_A) || occursin("l", opt_A))) && (opt_A *= " -E")
cmd *= opt_A
Expand All @@ -124,7 +124,7 @@ blockmode(arg1; kwargs...) = blockmode_helper("", arg1; kwargs...)
function blockmode_helper(cmd0::String, arg1; kwargs...)

d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
cmd = parse_these_opts("", d, [[:D :histogram_binning], [:Q :quick]])
cmd = parse_these_opts("", d, [[:D :histogram_binning], [:E :extend :extended], [:Q :quick]])
opt_A = add_opt(d, "", "A", [:A :field :fields], (mode="_z", scale="_s", highest="_h", lowest="_l", weight="_w", weights="_w"))
(!occursin(" -E", cmd) && (occursin("s", opt_A) || occursin("h", opt_A) || occursin("l", opt_A))) && (opt_A *= " -E")
cmd *= opt_A
Expand All @@ -135,7 +135,7 @@ end
# ---------------------------------------------------------------------------------------------------
function common_blocks(cmd0, arg1, d, cmd, proggy, kwargs...)

cmd = parse_these_opts(cmd, d, [[:C :center], [:E :extend :extended], [:W :weights]])
cmd = parse_these_opts(cmd, d, [[:C :center], [:W :weights]])
opt_G = parse_G(d, "")[1]

if (opt_G != "" && !occursin("-A", cmd))
Expand Down
Loading