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

WIP: Various tweaks to the Rewriters #548

Merged
merged 24 commits into from
May 6, 2024
Merged

WIP: Various tweaks to the Rewriters #548

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5e883dd
forward metadata in Walk
shashi Aug 8, 2023
657bd9b
create special slot ~MATCH which is only defined on the RHS and holds…
shashi Aug 8, 2023
80bf968
Merge branch 's/inspect' into s/rewriter-tweaks
shashi Aug 9, 2023
9a6e04e
allow early stop in Chain
shashi Aug 10, 2023
5de0612
add inspect for non-symbolic objects so user code does not have to check
shashi Aug 30, 2023
3b53344
prevent canonicalization and hence destruction of terms with metadata
shashi Aug 31, 2023
1a89dd5
fix check in +
shashi Sep 2, 2023
1517c40
fix typo
shashi Sep 22, 2023
9ce7c76
forward metadata in Walk
shashi Aug 8, 2023
05c87d4
create special slot ~MATCH which is only defined on the RHS and holds…
shashi Aug 8, 2023
4885f7b
allow early stop in Chain
shashi Aug 10, 2023
8c3b506
prevent canonicalization and hence destruction of terms with metadata
shashi Aug 31, 2023
1712ba9
fix check in +
shashi Sep 2, 2023
a1b8cf9
fix typo
shashi Sep 22, 2023
93545fb
remove redundant and wrpng nometa check
shashi Mar 15, 2024
5fa8545
messy rebase
Vaibhavdixit02 Apr 12, 2024
ec0383d
Messy rebase
Vaibhavdixit02 Apr 25, 2024
3680e8a
Merge branch 'master' into s/rewriter-tweaks
Vaibhavdixit02 Apr 25, 2024
a9867cc
Merge remote-tracking branch 'origin/s/rewriter-tweaks' into s/rewrit…
shashi Apr 26, 2024
0fd9fbe
left out line
shashi Apr 26, 2024
993d1fa
comment out repeated istree check
Vaibhavdixit02 May 6, 2024
f387fe6
Bring back istree check in walking
Vaibhavdixit02 May 6, 2024
6f76a28
Add test and fix branch in walk
Vaibhavdixit02 May 6, 2024
1457894
more test
Vaibhavdixit02 May 6, 2024
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
17 changes: 12 additions & 5 deletions src/rewriters.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module Rewriters
using SymbolicUtils: @timer
using TermInterface

import SymbolicUtils: similarterm
import SymbolicUtils: similarterm, istree, operation, arguments, unsorted_arguments, metadata, node_count
export Empty, IfElse, If, Chain, RestartedChain, Fixpoint, Postwalk, Prewalk, PassThrough

# Cache of printed rules to speed up @timer
Expand Down Expand Up @@ -63,18 +63,24 @@ If(f, x) = IfElse(f, x, Empty())

struct Chain
rws
stop_on_match::Bool
end
Chain(rws) = Chain(rws, false)

function (rw::Chain)(x)
for f in rw.rws
y = @timer cached_repr(f) f(x)
if rw.stop_on_match && !isnothing(y) && !isequal(y, x)
return y
end

if y !== nothing
x = y
end
end
return x
end

end
instrument(c::Chain, f) = Chain(map(x->instrument(x,f), c.rws))

struct RestartedChain{Cs}
Expand Down Expand Up @@ -195,8 +201,9 @@ function (p::Walk{ord, C, F, false})(x) where {ord, C, F}
if ord === :pre
x = p.rw(x)
end
if iscall(x)
x = p.similarterm(x, operation(x), map(PassThrough(p), unsorted_arguments(x)))
if istree(x)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks incorrect right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

elseif iscall(x)
x = p.similarterm(x, operation(x), map(PassThrough(p), unsorted_arguments(x)), metadata=metadata(x))
end
return ord === :post ? p.rw(x) : x
else
Expand All @@ -219,7 +226,7 @@ function (p::Walk{ord, C, F, true})(x) where {ord, C, F}
end
end
args = map((t,a) -> passthrough(t isa Task ? fetch(t) : t, a), _args, arguments(x))
t = p.similarterm(x, operation(x), args)
t = p.similarterm(x, operation(x), args, metadata=metadata(x))
end
return ord === :post ? p.rw(t) : t
else
Expand Down
2 changes: 1 addition & 1 deletion src/rule.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function (r::Rule)(term)

try
# n == 1 means that exactly one term of the input (term,) was matched
success(bindings, n) = n == 1 ? (@timer "RHS" rhs(bindings)) : nothing
success(bindings, n) = n == 1 ? (@timer "RHS" rhs(assoc(bindings, :MATCH, term))) : nothing
return r.matcher(success, (term,), EMPTY_IMMUTABLE_DICT)
catch err
throw(RuleRewriteError(r, term))
Expand Down
Loading