Merge pull request #2624 from daschw/default

don't reset defaults with backend()
This commit is contained in:
Daniel Schwabeneder 2020-04-24 20:28:55 +02:00 committed by GitHub
commit 5739acd044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions

View File

@ -680,15 +680,14 @@ function default(k::Symbol, v)
k in _suppress_warnings || error("Unknown key: ", k)
end
function default(; kw...)
if isempty(kw)
function default(; reset = true, kw...)
if reset && isempty(kw)
reset_defaults()
else
kw = KW(kw)
RecipesPipeline.preprocess_attributes!(kw)
for (k,v) in kw
default(k, v)
end
end
kw = KW(kw)
RecipesPipeline.preprocess_attributes!(kw)
for (k,v) in kw
default(k, v)
end
end

View File

@ -30,7 +30,7 @@ macro init_backend(s)
esc(quote
struct $T <: AbstractBackend end
export $sym
$sym(; kw...) = (default(; kw...); backend($T()))
$sym(; kw...) = (default(; reset = false, kw...); backend($T()))
backend_name(::$T) = Symbol($str)
backend_package_name(pkg::$T) = backend_package_name(Symbol($str))
push!(_backends, Symbol($str))