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.

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

virtualprocess: add include_callback #683

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/JET.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ const GENERAL_CONFIGURATIONS = Set{Symbol}((
# general
:report_config, :target_modules, :ignored_modules, :target_defined_modules,
# toplevel
:context, :analyze_from_definitions, :concretization_patterns, :virtualize, :toplevel_logger,
:context, :analyze_from_definitions, :concretization_patterns, :virtualize, :toplevel_logger, :include_callback,
# ui
:print_toplevel_success, :print_inference_success, :fullpath, :stacktrace_types_limit,
:vscode_console_output,
Expand Down
14 changes: 11 additions & 3 deletions src/toplevel/virtualprocess.jl
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,15 @@ struct ToplevelConfig
concretization_patterns::Vector{Any}
virtualize::Bool
toplevel_logger # ::Union{Nothing,IO}
include_callback # ::Union{Nothing,Base.Callable}
function ToplevelConfig(
pkgid::Union{Nothing,Base.PkgId} = nothing;
context::Module = Main,
analyze_from_definitions::Union{Bool,Symbol} = false,
concretization_patterns = Any[],
virtualize::Bool = true,
toplevel_logger::Union{Nothing,IO} = nothing,
include_callback::Union{Nothing,Base.Callable} = nothing,
__jetconfigs...)
concretization_patterns = Any[striplines(normalise(x)) for x in concretization_patterns]
for pat in default_concretization_patterns()
Expand All @@ -308,7 +310,8 @@ struct ToplevelConfig
analyze_from_definitions,
concretization_patterns,
virtualize,
toplevel_logger)
toplevel_logger,
include_callback)
end
end

Expand Down Expand Up @@ -822,7 +825,8 @@ function _virtual_process!(res::VirtualProcessResult,
fix_self_references!(res.actual2virtual, src)

interp = ConcreteInterpreter(filename, lnnref[], usemodule_with_err_handling,
context, analyzer, config, res, pkg_mod_depth)
context, analyzer, config, res, pkg_mod_depth,
config.include_callback)
if force_concretize
JuliaInterpreter.finish!(interp, Frame(context, src), true)
continue
Expand Down Expand Up @@ -1059,6 +1063,7 @@ struct ConcreteInterpreter{F,Analyzer<:AbstractAnalyzer}
config::ToplevelConfig
res::VirtualProcessResult
pkg_mod_depth::Int
include_callback # ::Union{Nothing,Base.Callable}
end

"""
Expand Down Expand Up @@ -1435,7 +1440,10 @@ function handle_include(interp::ConcreteInterpreter, @nospecialize(include_func)
end
# `scrub_offset = 3` corresponds to `with_err_handling` -> `f`
include_text = with_err_handling(read_err_handler, #=scrub_offset=#2) do
read(include_file, String)
if interp.include_callback === nothing # fallbacks to the default `read` function
return read(include_file, String)
end
return interp.include_callback(include_file)
end
isnothing(include_text) && return nothing # typically no file error

Expand Down
25 changes: 25 additions & 0 deletions test/toplevel/test_virtualprocess.jl
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,31 @@ end
include(mymapexpr, "somefile.jl")
end
end

# `include_callback`
function include_callback(filename::String)
return """
sum("julia")
"""
end
let res = @analyze_toplevel include_callback = include_callback begin
include("somefile.jl")
end
@test length(res.res.toplevel_error_reports) == 0
test_sum_over_string(res)
end
function include_callback_error(filename::String)
error("unexpected include")
end
let res = @analyze_toplevel include_callback = include_callback_error begin
include("somefile.jl")
end
@test length(res.res.toplevel_error_reports) == 1
report = only(res.res.toplevel_error_reports)
@test report isa ActualErrorWrapped
err = report.err
@test err isa ErrorException
end
end

@testset "module definition" for s in ("""
Expand Down
Loading