Do not let _opt_ in a sub-methods use Char. This reduces multiple-recompilations. (#1937)

Author: joa-quim

src/common_options.jl

@@ -1838,7 +1838,7 @@ function parse_params(d::Dict, cmd::String; del::Bool=true)::String
 end
 
 # ---------------------------------------------------------------------------------------------------
-function add_opt_pen(d::Dict, symbs::Union{Nothing, VMs}; opt::String="", del::Bool=true)::String
+function add_opt_pen(d::Dict, @nospecialize(symbs::Union{Nothing, VMs}); opt::String="", del::Bool=true)::String
 	# Build a pen option. Input can be either a full hard core string or spread in lw (or lt), lc, ls, etc or a tuple
 
 	(SHOW_KWARGS[]) && return print_kwarg_opts(symbs, "NamedTuple | Tuple | String | Number")	# Just print the options
@@ -2308,9 +2308,9 @@ end
 # ---------------------------------------------------------------------------------------------------
 function add_opt(d::Dict, cmd::String, opt::String, mapa::NamedTuple)::String
 	# Thin wrapper: convert NT to Dict to compile _add_opt only once
-	_add_opt_1(d, cmd, opt, nt2dict(mapa))
+	_add_opt_1(d, cmd, opt, Dict{Symbol,Any}(nt2dict(mapa)))
 end
-function _add_opt_1(d::Dict, cmd::String, opt::String, mapa::Dict)::String
+function _add_opt_1(d::Dict, cmd::String, opt::String, mapa::Dict{Symbol,Any})::String
 	cmd_::String = ""
 	for k in keys(mapa)
 		((val_ = find_in_dict(d, [k], false)[1]) === nothing) && continue	# This mapa key was not used
@@ -2339,11 +2339,11 @@ end
 function add_opt(d::Dict, cmd::String, opt::String, symbs::VMs, mapa; grow_mat=nothing, del::Bool=true, expand::Bool=false, expand_str::Bool=false)::String
 	# Thin wrapper: convert NamedTuple mapa to Dict to avoid recompilation for each distinct NT type
 	mapa_is_nt = isa(mapa, NamedTuple)
-	_mapa = mapa_is_nt ? nt2dict(mapa) : mapa
-	_add_opt_2(d, cmd, opt, symbs, _mapa; grow_mat=grow_mat, del=del, expand=expand, expand_str=expand_str, mapa_is_nt=mapa_is_nt)
+	_mapa = mapa_is_nt ? Dict{Symbol,Any}(nt2dict(mapa)) : (mapa === nothing ? Dict{Symbol,Any}() : mapa)
+	_add_opt_2(d, cmd, opt, vec(symbs), _mapa, grow_mat, del, expand, expand_str, mapa_is_nt)
 end
 
-function _add_opt_2(d::Dict, cmd::String, opt::String, symbs::VMs, mapa; grow_mat=nothing, del::Bool=true, expand::Bool=false, expand_str::Bool=false, mapa_is_nt::Bool=false)::String
+function _add_opt_2(d::Dict, cmd::String, opt::String, symbs::Vector{Symbol}, @nospecialize(mapa), @nospecialize(grow_mat), del::Bool, expand::Bool, expand_str::Bool, mapa_is_nt::Bool)::String
 	# Scan the D Dict for SYMBS keys and if found create the new option OPT and append it to CMD
 	# If DEL == false we do not remove the found key.
 	# 'grow_mat=mat', is a special case to append to a matrix (can't realy be done in Julia)
@@ -2598,7 +2598,7 @@ function _add_opt_3(d::Dict, cmd::String, opt::String, symbs::VMs, need_symb::Sy
 				opt = string(opt,val)
 				to_slot = false
 			end
-			cmd = _add_opt_2(d, cmd, opt, symbs, nt_opts_d; mapa_is_nt=true)
+			cmd = _add_opt_2(d, cmd, opt, vec(symbs), nt_opts_d, nothing, true, false, false, true)
 		elseif (isa(val, Array{<:Real}) || isa(val, GDtype) || isa(val, GMTcpt) || typeof(val) <: AbstractRange)
 			if (typeof(val) <: AbstractRange)  val = collect(val)  end
 			cmd = string(cmd, " -", opt)
@@ -2717,18 +2717,18 @@ function add_opt_fill(d::Dict, opt::String="")
 	add_opt_fill(d, [collect(keys(d))[1]], opt)			# Use ONLY when len(d) == 1
 end
 add_opt_fill(d::Dict, symbs::VMs, opt="") = add_opt_fill("", d, symbs, opt)
-function add_opt_fill(cmd::String, d::Dict, symbs::VMs, opt="", del::Bool=true)::String
+function add_opt_fill(cmd::String, d::Dict, @nospecialize(symbs::VMs), opt::String="", del::Bool=true)::String
 	# Deal with the area fill attributes option. Normally, -G
 	(SHOW_KWARGS[]) && return print_kwarg_opts(symbs, "NamedTuple | Tuple | Array | String | Number")
 	((val = find_in_dict(d, symbs, del)[1]) === nothing) && return cmd
 	isa(val, AbstractDict) && (val = Base.invokelatest(dict2nt, val))
 	(val == true && symbs == [:G :fill]) && (val="#0072BD")		# Let fill=true mean a default color
 	(val == "" && symbs == [:G :fill]) && return cmd			# Let fill="" mean no fill (handy for proggy reasons)
-	(opt != "") && (opt = string(" -", opt))
+	(opt !== "") && (opt = string(" -", opt))
 	return add_opt_fill(val, cmd, opt)
 end
 
-function add_opt_fill(@nospecialize(val), cmd::String="",  opt="")::String
+function add_opt_fill(@nospecialize(val), cmd::String="",  opt::String="")::String
 	# This method can be called directy with VAL as a NT or a string
 	if (isa(val, Tuple) && length(val) == 2 && (isa(val[1], Tuple) || isa(val[1], NamedTuple)))
 		# wiggle, for example, may want to repeat the call to fill (-G). Then we expect a Tuple of -G's
@@ -2737,7 +2737,7 @@ function add_opt_fill(@nospecialize(val), cmd::String="",  opt="")::String
 	elseif (isvector(val) && length(val) == 2 && isa(val[1], String))
 		# The above case works but may be uggly sometimes; e.g. fill=(("red+p",), ("blue+n",))
 		# So accept also a vector of strings and do not try to interpret its contents. Ex: fill(["red+p", "blue+n"]
-		(opt != "" && !startswith(opt, " -")) && (opt = string(" -", opt))
+		(opt !== "" && !startswith(opt, " -")) && (opt = string(" -", opt))
 		cmd = cmd * opt * val[1]::String * opt * val[2]::String
 	elseif (isa(val, NamedTuple))
 		d2::Dict = nt2dict(val)

src/geodesy/psvelo.jl

@@ -27,8 +27,8 @@ function velo(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any})
 		cmd = (isa(val, String)) ? cmd * " -A" * val : cmd * " -A" * vector_attrib(val) 
 	end
 
-	cmd = add_opt_fill(cmd, d, [:E :fill_wedges :uncertaintyfill], 'E')
-	cmd = add_opt_fill(cmd, d, [:G :fill :fill_symbols], 'G')
+	cmd = add_opt_fill(cmd, d, [:E :fill_wedges :uncertaintyfill], "E")
+	cmd = add_opt_fill(cmd, d, [:G :fill :fill_symbols], "G")
 	cmd = parse_these_opts(cmd, d, [[:D :sigma_scale], [:L :outlines], [:N :no_clip :noclip]])
 
 	if     (haskey(d, :Se) || haskey(d, :velo_NE))      symbs = [:Se :vel_NE]

src/grdvector.jl

@@ -147,7 +147,7 @@ function grdvector_helper(arg1, arg2, K::Bool, O::Bool, d::Dict{Symbol, Any})
 	defNorm, defHead = @sprintf("%.6g%s", as/2+1e-7, km_u), "yes"
 
 	opt_Q = !isbarbs ? parse_Q_grdvec(d, [:Q :vec :vector :arrow], defLen, defHead, defNorm) : ""
-	!occursin(" -G", opt_Q) && (cmd = add_opt_fill(cmd, d, [:G :fill], 'G'))	# If fill not passed in arrow, try from regular option
+	!occursin(" -G", opt_Q) && (cmd = add_opt_fill(cmd, d, [:G :fill], "G"))	# If fill not passed in arrow, try from regular option
 	cmd *= add_opt_pen(d, [:W :pen], opt="W")
 	(!occursin(" -C", cmd) && !occursin(" -W", cmd) && !occursin(" -G", opt_Q)) && (cmd *= " -W0.5")	# If still nothing, set -W.
 	(opt_Q != "") && (cmd *= opt_Q)

src/pscoast.jl

@@ -152,8 +152,8 @@ function coast_parser(first::Bool, clip::String, O::Bool, d::Dict{Symbol, Any})
 	cmd  = parse_Td(d, cmd)
 	cmd  = parse_Tm(d, cmd)
 	cmd  = parse_L(d, cmd)
-	cmd  = add_opt_fill(cmd, d, [:G :land], 'G')
-	cmd  = add_opt_fill(cmd, d, [:S :water :ocean], 'S')
+	cmd  = add_opt_fill(cmd, d, [:G :land], "G")
+	cmd  = add_opt_fill(cmd, d, [:S :water :ocean], "S")
 
 	if (clip !== "")
 		if     (clip == "land")    cmd *= " -Gc"

src/pshistogram.jl

@@ -120,7 +120,7 @@ function histogram_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol,A
 	cmd = parse_common_opts(d, cmd, [:UVXY :JZ :c :e :f :p :t :w :params :margin]; first=!O)[1]
 	cmd = parse_these_opts(cmd, d, [[:A :horizontal], [:F :center], [:Q :cumulative], [:S :stairs]])
 	nofill = ((symb = is_in_dict(d, [:G :fill])) !== nothing && d[symb] == "") ? true : false	# To know if no fill was asked
-	cmd = add_opt_fill(cmd, d, [:G :fill], 'G')
+	cmd = add_opt_fill(cmd, d, [:G :fill], "G")
 	cmd = add_opt(d, cmd, "D", [:D :annot :annotate :counts], (beneath = "_+b", font = "+f", offset = "+o", vertical = "_+r"))
 	cmd = parse_INW_coast(d, [[:N :distribution :normal]], cmd, "N")
 	(SHOW_KWARGS[]) && print_kwarg_opts(symbs, "NamedTuple | Tuple | Dict | String")

src/psmask.jl

@@ -89,7 +89,7 @@ function mask(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any})
 		return isinv ? mat2img(collect(arg1.z .<= thres), arg1) : mat2img(collect(arg1.z .>= thres), arg1)
 	end
 
-	cmd = add_opt_fill(cmd, d, [:G :fill], 'G')
+	cmd = add_opt_fill(cmd, d, [:G :fill], "G")
 	cmd = gmt_proggy * cmd
 	((r = check_dbg_print_cmd(d, cmd)) !== nothing) && return r
 	prep_and_call_finish_PS_module(d, cmd, "", K, O, true, arg1)

src/psrose.jl

@@ -109,7 +109,7 @@ function rose_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any})
 
 	cmd = add_opt(d, cmd, "E", [:E :vectors])
 	cmd, arg1, arg2, = add_opt_cpt(d, cmd, CPTaliases, 'C', N_args, arg1, arg2)
-	cmd = add_opt_fill(cmd, d, [:G :fill], 'G')
+	cmd = add_opt_fill(cmd, d, [:G :fill], "G")
 	cmd *= opt_pen(d, 'W', [:W :pen])
 
 	_cmd = [gmt_proggy * cmd]

src/pssolar.jl

@@ -54,7 +54,7 @@ function solar(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any})
 	cmd, = parse_common_opts(d, cmd, [:bo :c :h :o :p :t :UVXY :params]; first=!O)
 	cmd  = parse_these_opts(cmd, d, [[:C :format], [:M :dump], [:N :invert]])
 
-	cmd  = add_opt_fill(cmd, d, [:G :fill], 'G')
+	cmd  = add_opt_fill(cmd, d, [:G :fill], "G")
 	cmd  = add_opt(d, cmd, "I", [:I :sun], (pos="",date="+d",TZ="+z"))
 	cmd  = add_opt(d, cmd, "T", [:T :terminators], (term="",date="+d",TZ="+z"))
 	cmd *= opt_pen(d, 'W', [:W :pen])

src/pstext.jl

@@ -119,7 +119,7 @@ function _text(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol,Any})
 	cmd = add_opt(d, cmd, "D", [:D :offset], (away=("j", nothing, 1), corners=("J", nothing, 1), shift="", line=("+v",add_opt_pen)))
 	opt_F = add_opt(d, "", "F", [:F :attrib],
 		(angle="+a", Angle="+A", font=("+f", font), justify="+j", region_justify="+c", header="_+h", label="_+l", rec_number="_+r", text="+t", zvalues="_+z"); expand=true)
-	cmd = add_opt_fill(cmd, d, [:G :fill], 'G')
+	cmd = add_opt_fill(cmd, d, [:G :fill], "G")
 	contains(cmd, " -G") && (CTRL.pocket_B[3] = ".")	# Signal gmt() that it needs to restart because the fill f the API
 	cmd *= add_opt_pen(d, [:W :pen], opt="W")
 

src/pswiggle.jl

@@ -82,7 +82,7 @@ function wiggle_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol, Any
                             (map=("g", arg2str, 1), outside=("J", arg2str, 1), inside=("j", arg2str, 1), norm=("n", arg2str, 1), paper=("x", arg2str, 1), anchor=("", arg2str, 2), width=("+w", arg2str), justify="+j", label_left="_+al", labels="+l", label="+l", offset=("+o", arg2str)), 'j')
 	cmd *= opt_pen(d, 'T', [:T :track])
 	cmd *= opt_pen(d, 'W', [:W :pen])
-	cmd = add_opt_fill(cmd, d, [:G :fill], 'G')
+	cmd = add_opt_fill(cmd, d, [:G :fill], "G")
 
 	_cmd = [gmt_proggy * cmd]
 	_cmd = frame_opaque(_cmd, gmt_proggy, opt_B, opt_R, opt_J)		# No -t in frame