Skip to content

Within-module eval can break precompile #6

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

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Within-module eval can break precompile #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/stylemacro.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ macro styled_str(raw_content::String)
nothing
end

hygienic_eval(expr) = Core.eval(__module__, Expr(:var"hygienic-scope", expr, @__MODULE__))

function addpart!(state, stop::Int)
if state.point[] > stop+state.offset[]+ncodeunits(state.content[stop])-1
return state.point[] = nextind(state.content, stop) + state.offset[]
Expand Down Expand Up @@ -537,7 +539,7 @@ macro styled_str(raw_content::String)
if needseval
:(Pair{Symbol, Any}(:face, $face))
else
Pair{Symbol, Any}(:face, eval(face))
Pair{Symbol, Any}(:face, hygienic_eval(face))
end))
end

Expand Down Expand Up @@ -669,7 +671,7 @@ macro styled_str(raw_content::String)
elseif state.interpolated[]
:(annotatedstring($(state.parts...)))
else
annotatedstring(map(eval, state.parts)...) |> Base.annotatedstring_optimize!
annotatedstring(map(hygienic_eval, state.parts)...) |> Base.annotatedstring_optimize!
end
end

Expand Down