Skip to content

Check isdefined(lambdainfo, :slotnames) before accessing #62

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

Open
timholy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check isdefined(lambdainfo, :slotnames) before accessing #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4aedfc
Check isdefined(lambdainfo, :slotnames) before accessing
timholy Nov 13, 2016
22a9791
Add 0.5 to .travis.yml
timholy Nov 22, 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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ os:
- linux
- osx
julia:
- 0.5
- nightly
notifications:
email: false
Expand Down
12 changes: 6 additions & 6 deletions src/ASTInterpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,12 +1262,12 @@ function eval_in_interp(interp, body, slbody = nothing, code = "")
selfsym = Symbol("#self#") # avoid having 2 arguments called `#self#`
unusedsym = Symbol("#unused#")
env = get_env_for_eval(interp)
linfo = get_linfo(interp)
lnames = Any[linfo.slotnames[2:end]..., linfo.sparam_syms...]
linfoi = get_linfo(interp)
lnames = isdefined(linfoi, :slotnames) ? Any[linfoi.slotnames[2:end]..., linfoi.sparam_syms...] : Any[linfoi.sparam_syms...]
map!(x->(x===selfsym || !sym_visible(x) ? unusedsym : x), lnames)
lnames = unique(lnames)
f = Expr(:->,Expr(:tuple,lnames...), body)
lam = linfo.def.module.eval(f)
lam = linfoi.def.module.eval(f)
linfo = first(methods(lam)).lambda_template
# New interpreter is on detached stack
loctree = nothing
Expand All @@ -1282,9 +1282,9 @@ function eval_in_interp(interp, body, slbody = nothing, code = "")
if haskey(env.last_reference, varname)
eval_env.locals[lidx] = env.locals[env.last_reference[varname]]
else
oldidx = findfirst(get_linfo(interp).slotnames, varname)
oldidx = isdefined(linfoi, :slotnames) ? findfirst(linfoi.slotnames, varname) : 0
if oldidx == 0
sparamidx = findfirst(get_linfo(interp).sparam_syms, varname)
sparamidx = findfirst(linfoi.sparam_syms, varname)
sparamidx == 0 && continue
eval_env.locals[lidx] = env.sparams[sparamidx]
else
Expand Down Expand Up @@ -1501,7 +1501,7 @@ function execute_command(state, interp::Interpreter, cmd::Union{Val{:s},Val{:si}
if x !== nothing
state.interp = state.top_interp = x
if (cmd == Val{:s}() || cmd == Val{:sg}())
state.interp = state.top_interp =
state.interp = state.top_interp =
maybe_step_through_wrapper!(state.interp)
next_call!(state.interp)
end
Expand Down