Skip to content

Another round of no-recompiles on the gmt() fun. Now we'll have only one. #1931

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
joa-quim merged 1 commit into from
Feb 24, 2026
Merged

Another round of no-recompiles on the gmt() fun. Now we'll have only one. #1931

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
5 changes: 3 additions & 2 deletions src/common_options.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5101,11 +5101,12 @@ function help_show_options(d::Dict)
end

# --------------------------------------------------------------------------------------------------
print_kwarg_opts(symbs::VMs, mapa::NamedTuple)::String = print_kwarg_opts(symbs, nt2dict(mapa))
function print_kwarg_opts(symbs::VMs, mapa=nothing)::String
# Print the kwargs options
opt::String = "Option: " * join([string(x, ", or ") for x in symbs])[1:end-5]::String
if (isa(mapa, NamedTuple))
keys_ = keys(mapa)
if (isa(mapa, Dict{Symbol, Any}))
keys_ = collect(keys(mapa))
vals = Vector{String}(undef, length(keys_))
for k = 1:numel(keys_)
t = mapa[keys_[k]]
Expand Down
14 changes: 8 additions & 6 deletions src/gmt_main.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@ function gmt(cmd::String, args...)
end
end
# We may have trailing [] args in modules
baka = n_argin
bak = n_argin
while (n_argin > 0 && (args[n_argin] === nothing)) n_argin -= 1 end
baka != n_argin && (args = args[1:n_argin])
argsV = (bak != n_argin) ? Any[args[k] for k in 1:n_argin] : Any[args...]
else
argsV = Any[]
end
_gmt(cmd, args...)
_gmt(cmd, argsV)
end

function _gmt(cmd::String, args...)
function _gmt(cmd::String, args::Vector{Any})

(cmd == "") && return nothing # Building docs with Quarto leads here when examples use ModernMode
(cmd == "destroy") && return gmt_restart()
ressurectGDAL() # Some GMT modules may have called GDALDestroyDriverManager()
ressurectGDAL() # Some GMT modules may have called GDALDestroyDriverManager()
DidOneGmtCmd[] = true # Even if something errors here this keeps track that gmt() already called once
n_argin::Int = length(args)

Expand Down Expand Up @@ -137,7 +139,7 @@ function _gmt(cmd::String, args...)
XX = GMT_Encode_Options(G_API[], g_module, n_argin, pLL, n_itemsP) # This call also changes LL
n_items = n_itemsP[]
if (XX == NULL && n_items > 65000) # Just got usage/synopsis option (if (n_items == UINT_MAX)) in C
(n_items > 65000) ? n_items = 0 : error("Failure to encode Julia command options")
(n_items > 65000) ? n_items = 0 : error("Failure to encode Julia command options")
end

# For modules that can have no options (e.g. gmtinfo) the LinkedList (LL) is actually created in GMT_Encode_Option
Expand Down
Loading