Skip to content

Rewrap after unwrap in apply_to_variables #2079

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
Feb 9, 2023
Merged

Rewrap after unwrap in apply_to_variables #2079

Show file tree
Hide file tree
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
9 changes: 5 additions & 4 deletions src/systems/abstractsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,15 @@ function Base.setproperty!(sys::AbstractSystem, prop::Symbol, val)
end
end

function apply_to_variables(f::F, ex) where {F}
ex = value(ex)
apply_to_variables(f::F, ex) where {F} = _apply_to_variables(f, ex)
apply_to_variables(f::F, ex::Num) where {F} = wrap(_apply_to_variables(f, unwrap(ex)))
function _apply_to_variables(f::F, ex) where {F}
if isvariable(ex)
return f(ex)
end
istree(ex) || return ex
similarterm(ex, apply_to_variables(f, operation(ex)),
map(Base.Fix1(apply_to_variables, f), arguments(ex)),
similarterm(ex, _apply_to_variables(f, operation(ex)),
map(Base.Fix1(_apply_to_variables, f), arguments(ex)),
metadata = metadata(ex))
end

Expand Down
1 change: 1 addition & 0 deletions test/variable_scope.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ using Test
b = ParentScope(b)
c = ParentScope(ParentScope(c))
d = GlobalScope(d)
@test all(x -> x isa Num, [b, c, d])

# ensure it works on Term too
LocalScope(e.val)
Expand Down