Skip to content

Commit d935e92

Browse files
authored
A bunch of modules received a recompiling protection entry function. (#1902)
1 parent 36c58e8 commit d935e92

10 files changed

Lines changed: 43 additions & 21 deletions

File tree

src/grd2cpt.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ To see the full documentation type: ``@? grd2cpt``
6565
"""
6666
grd2cpt(cmd0::String; kwargs...) = grd2cpt_helper(cmd0, nothing; kwargs...)
6767
grd2cpt(arg1; kwargs...) = grd2cpt_helper("", arg1; kwargs...)
68+
function grd2cpt_helper(cmd0::String, arg1; kwargs...)
69+
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
70+
grd2cpt_helper(cmd0, arg1, d)
71+
end
6872

6973
# ---------------------------------------------------------------------------------------------------
70-
function grd2cpt_helper(cmd0::String, arg1; kw...)
71-
72-
d = init_module(false, kw...)[1] # Also checks if the user wants ONLY the HELP mode
74+
function grd2cpt_helper(cmd0::String, arg1, d::Dict{Symbol, Any})
7375

7476
cmd, = parse_common_opts(d, "", [:R :V_params :b :h :t])
7577
cmd, Tvec = helper_cpt(d, cmd)
@@ -80,7 +82,7 @@ function grd2cpt_helper(cmd0::String, arg1; kw...)
8082

8183
cmd, got_fname, arg1 = find_data(d, cmd0, cmd, arg1)
8284
N_used = got_fname == 0 ? 1 : 0 # To know whether a cpt will go to arg1 or arg2
83-
isa(arg1, GMTgrid) && ((val = find_in_kwargs(kw, CPTaliases)[1]) === nothing) && (d[:C] = (arg1.cpt != "") ? arg1.cpt : :turbo)
85+
isa(arg1, GMTgrid) && ((val = is_in_dict(d, CPTaliases)) === nothing) && (d[:C] = (arg1.cpt != "") ? arg1.cpt : :turbo)
8486
cmd, arg1, arg2, = add_opt_cpt(d, cmd, CPTaliases, 'C', N_used, arg1)
8587

8688
r = common_grd(d, "grd2cpt " * cmd, arg1, arg2) # r may be a tuple if -E+f was used

src/grd2xyz.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ Parameters
3838
"""
3939
grd2xyz(cmd0::String; kwargs...) = grd2xyz_helper(cmd0, nothing; kwargs...)
4040
grd2xyz(arg1; kwargs...) = grd2xyz_helper("", arg1; kwargs...)
41+
function grd2xyz_helper(cmd0::String, arg1; kwargs...)
42+
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
43+
grd2xyz_helper(cmd0, arg1, d)
44+
end
4145

4246
# ---------------------------------------------------------------------------------------------------
43-
function grd2xyz_helper(cmd0::String, arg1; kwargs...)
47+
function grd2xyz_helper(cmd0::String, arg1, d::Dict{Symbol, Any})
4448

45-
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
4649
cmd, = parse_common_opts(d, "", [:R :V_params :bo :d :f :h :o :s])
4750
cmd = parse_these_opts(cmd, d, [[:C :rcnumbers :row_col :rowcol], [:L :hvline], [:T :stl :STL], [:W :weight], [:Z :onecol :one_col]])
4851
((val = find_in_dict(d, [:name :save])[1]) !== nothing) && (cmd *= " > " * string(val))

src/grdcontour.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function grdcontour_helper(cmd0::String, arg1; first=true, kw...)
7373
d, K, O = init_module(first, kw...) # Also checks if the user wants ONLY the HELP mode
7474
_grdcontour_helper(cmd0, arg1, O, K, d)
7575
end
76-
function _grdcontour_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict)
76+
function _grdcontour_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any})
7777
arg2, arg3 = nothing, nothing
7878
dict_auto_add!(d) # The ternary module may send options via another channel
7979

src/grdinfo.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ To see the full documentation type: ``@? grdinfo``
4747
"""
4848
grdinfo(cmd0::String; kwargs...) = grdinfo_helper(cmd0, nothing; kwargs...)
4949
grdinfo(arg1; kwargs...) = grdinfo_helper("", arg1; kwargs...)
50+
function grdinfo_helper(cmd0::String, arg1; kwargs...)
51+
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
52+
grdinfo_helper(cmd0, arg1, d)
53+
end
5054

5155
# ---------------------------------------------------------------------------------------------------
52-
function grdinfo_helper(cmd0::String, arg1; kwargs...)::Union{GMTdataset, String}
56+
function grdinfo_helper(cmd0::String, arg1, d::Dict{Symbol, Any})::Union{GMTdataset, String}
5357

54-
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
5558
cmd, = parse_common_opts(d, "", [:R :V_params :f :o])
5659
(is_in_dict(d, [:numeric], del=true) !== nothing) && (cmd *= " -Cn")
5760
cmd = parse_these_opts(cmd, d, [[:C :oneliner], [:D :tiles], [:E :extrema :extreme], [:F :report_ingeog],

src/grdlandmask.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ To see the full documentation type: ``@? grdlandmask``
4242
grdlandmask(cmd0::String; kwargs...) = grdlandmask_helper(cmd0, nothing; kwargs...)
4343
grdlandmask(arg1::GItype; kwargs...) = grdlandmask_helper("", arg1; kwargs...)
4444
grdlandmask(; kwargs...) = grdlandmask_helper("", nothing; kwargs...)
45+
function grdlandmask_helper(cmd0::String, arg1; kwargs...)
46+
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
47+
grdlandmask_helper(cmd0, arg1, d)
48+
end
4549

4650
# ---------------------------------------------------------------------------------------------------
47-
function grdlandmask_helper(cmd0::String, arg1; kwargs...)
51+
function grdlandmask_helper(cmd0::String, arg1, d::Dict{Symbol, Any})
4852

49-
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
5053
cmd::String, prj::String = "", ""
5154
if (arg1 !== nothing)
5255
prj = getproj(arg1, proj4=true)

src/grdmask.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ To see the full documentation type: ``@? grdmask``
4747
"""
4848
grdmask(cmd0::String; kwargs...) = grdmask_helper(cmd0, nothing; kwargs...)
4949
grdmask(arg1; kwargs...) = grdmask_helper("", arg1; kwargs...)
50+
function grdmask_helper(cmd0::String, arg1; kwargs...)
51+
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
52+
grdmask_helper(cmd0, arg1, d)
53+
end
5054

5155
# ---------------------------------------------------------------------------------------------------
52-
function grdmask_helper(cmd0::String, arg1; kwargs...)
56+
function grdmask_helper(cmd0::String, arg1, d::Dict{Symbol, Any})
5357

54-
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
5558
cmd, = parse_common_opts(d, "", [:G :RIr :V_params :a :e :f :g :j :n :yx :x :w])
5659
cmd = parse_these_opts(cmd, d, [[:A :steps :straight_lines], [:C :clober], [:N :out_edge_in], [:S :search_radius]])
5760
if (cmd0 != "")

src/grdsample.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@ To see the full documentation type: ``@? grdsample``
2929
"""
3030
grdsample(cmd0::String; kwargs...) = grdsample_helper(cmd0, nothing; kwargs...)
3131
grdsample(arg1; kwargs...) = grdsample_helper("", arg1; kwargs...)
32+
function grdsample_helper(cmd0::String, arg1; kwargs...)
33+
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
34+
grdsample_helper(cmd0, arg1, d)
35+
end
3236

3337
# ---------------------------------------------------------------------------------------------------
34-
function grdsample_helper(cmd0::String, arg1; kwargs...)
38+
function grdsample_helper(cmd0::String, arg1, d::Dict{Symbol, Any})
3539

36-
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
3740
cmd, = parse_common_opts(d, "", [:G :RIr :V_params :f :n :x])
3841
cmd = parse_these_opts(cmd, d, [[:T :toggle]])
39-
4042
common_grd(d, cmd0, cmd, "grdsample ", arg1) # Finish build cmd and run it
4143
end

src/grdtrack.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ That is, both of this will work: ``D = grdtrack([0 0], Grid);`` or ``D = grdtr
99
1010
To see the documentation, type: ``@? grdtrack``
1111
"""
12-
function grdtrack(cmd0::String="", arg1=nothing, arg2=nothing; kwargs...)
13-
12+
function grdtrack(cmd0::String, arg1=nothing, arg2=nothing; kwargs...)
1413
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
14+
grdtrack_helper(cmd0, arg1, arg2, d)
15+
end
16+
17+
function grdtrack_helper(cmd0::String, arg1, arg2, d::Dict{Symbol, Any})
1518

1619
cmd, = parse_common_opts(d, "", [:R :V_params :bi :bo :di :e :f :g :h :i :n :o :s :w :yx])
1720
cmd = parse_these_opts(cmd, d, [[:A :interp_path :resample], [:C :crossprofile :equidistant], [:D :dfile],

src/grdtrend.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ Parameters
2424
2525
To see the full documentation type: ``@? grdtrend``
2626
"""
27-
function grdtrend(cmd0::String="", arg1=nothing, arg2=nothing; kwargs...)
28-
27+
function grdtrend(cmd0::String, arg1=nothing, arg2=nothing; kwargs...)
2928
d = init_module(false, kwargs...)[1] # Also checks if the user wants ONLY the HELP mode
29+
grdtrend_helper(cmd0, arg1, arg2, d)
30+
end
31+
32+
function grdtrend_helper(cmd0::String, arg1, arg2, d::Dict{Symbol, Any})
3033

3134
cmd, = parse_R(d, "")
3235
cmd = parse_V_params(d, cmd)

src/grdview.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function grdview_helper(cmd0::String, arg1; first=true, kwargs...)
5353
d, K, O = init_module(first, kwargs...) # Also checks if the user wants ONLY the HELP mode
5454
invokelatest(grdview_helper, cmd0, arg1, O, K, d)
5555
end
56-
function grdview_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict)
56+
function grdview_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any})
5757

5858
arg2 = nothing; arg3 = nothing; arg4 = nothing; arg5 = nothing;
5959
first = !O

0 commit comments

Comments
 (0)