mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

working on plotrecipe

Browse Source
This commit is contained in:
Thomas Breloff 2016-05-05 12:22:31 -04:00
parent cdc0d22b01
commit 74c76c48d5
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/recipes.jl
View File

@ -32,6 +32,36 @@ macro kw(k, v)
esc(:(get!(d, $k, $v))) esc(:(get!(d, $k, $v)))
end end
# TODO: when this is moved out of Plots, also move the replacement of key aliases to just after the _apply_recipe calls
function replace_recipe_arrows!(expr::Expr)
for (i,e) in enumerate(expr.args)
if isa(e,Expr)
if e.head == :(=>)
# swap out this arrow expression with a call to get!(d, ...)
k, v = e.args[1:2]
expr.args[i] = :(get!(d, get(Plots._keyAliases, $k, $k), $v))
elseif e.head != :call
# we want to recursively replace the arrows, but not inside function calls
# as this might include things like Dict(1=>2)
replace_recipe_arrows!(e)
end
end
end
end
# inject this for optional params:
# 2: Expr
# head: Symbol parameters
# args: Array(Any,(1,))
# 1: Expr
# head: Symbol kw
# args: Array(Any,(2,))
# 1: Symbol c
# 2: Int64 5
# typ: Any
# typ: Any
macro plotrecipe(args, expr) macro plotrecipe(args, expr)
if !isa(args, Expr) if !isa(args, Expr)
error("The first argument to `@plotrecipe` should be a valid argument list for dispatch.") error("The first argument to `@plotrecipe` should be a valid argument list for dispatch.")
@ -43,17 +73,11 @@ macro plotrecipe(args, expr)
end end
# replace all the key => value lines with argument setting logic # replace all the key => value lines with argument setting logic
# TODO: when this is moved out of Plots, also move the replacement of key aliases to just after the _apply_recipe calls replace_recipe_arrows!(expr)
for (i,e) in enumerate(expr.args)
if isa(e,Expr) && e.head == :(=>)
k, v = e.args[1:2]
expr.args[i] = :(get!(d, get(Plots._keyAliases, $k, $k), $v))
end
end
# now build a function definition for _apply_recipe, wrapping the return value in a tuple if needed # now build a function definition for _apply_recipe, wrapping the return value in a tuple if needed
esc(quote esc(quote
function Plots._apply_recipe(d::KW, $(args.args...); kw...) function Plots._apply_recipe(d::KW, $(args.args...); issubplot=false, kw...)
ret = $expr ret = $expr
if typeof(ret) <: Tuple if typeof(ret) <: Tuple
ret ret