Skip to content
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

feed quasiquote variables in as arguments #30

Merged
merged 2 commits into from
Dec 7, 2016
Merged

feed quasiquote variables in as arguments #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d543380
feed quasiquote variables in as arguments
vtjnash Nov 23, 2016
3c47be2
handle case where core isn't and Expr
vtjnash Nov 24, 2016
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
31 changes: 28 additions & 3 deletions src/execution.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,23 @@ function collectvars(ex::Expr, vars::Vector{Symbol} = Symbol[])
return vars
end

function quasiquote!(ex::Expr, vars::Vector{Expr})
if ex.head === :($)
lhs = ex.args[1]
rhs = isa(lhs, Symbol) ? gensym(lhs) : gensym()
push!(vars, Expr(:(=), rhs, ex))
return rhs
elseif ex.head !== :quote
for i in 1:length(ex.args)
arg = ex.args[i]
if isa(arg, Expr)
ex.args[i] = quasiquote!(arg, vars)
end
end
end
return ex
end

macro benchmark(args...)
tmp = gensym()
_, params = prunekwargs(args...)
Expand All @@ -189,7 +206,7 @@ macro benchmarkable(args...)
core, params = prunekwargs(args...)

# extract setup/teardown if present, removing them from the original expression
setup, teardown = :(), :()
setup, teardown = nothing, nothing
delinds = Int[]
for i in eachindex(params)
ex = params[i]
Expand All @@ -203,8 +220,16 @@ macro benchmarkable(args...)
end
deleteat!(params, delinds)

if isa(core, Expr)
quote_vars = Expr[]
core = quasiquote!(core, quote_vars)
if !isempty(quote_vars)
setup = Expr(:block, setup, quote_vars...)
end
end

# extract any variable bindings shared between the core and setup expressions
setup_vars = collectvars(setup)
setup_vars = isa(setup, Expr) ? collectvars(setup) : []
core_vars = isa(core, Expr) ? collectvars(core) : []
out_vars = filter(var -> var in setup_vars, core_vars)

Expand Down Expand Up @@ -234,7 +259,7 @@ function generate_benchmark_definition(eval_module, out_vars, setup_vars,
samplefunc = gensym("sample")
signature = Expr(:call, corefunc, setup_vars...)
if length(out_vars) == 0
returns = :()
#returns = :(return $(Expr(:tuple, setup_vars...)))
invocation = signature
core_body = core
elseif length(out_vars) == 1
Expand Down