github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-04-20 03:03:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #683 from powdr-labs/new_visitor

Browse Source 
Change expression visitor to be more flexible.
This commit is contained in:
chriseth
2023-10-09 14:51:04 +00:00
committed by GitHub
parent 1765b9b431 58cce78784
commit 16ddc3919f
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ast/src/analyzed/visitor.rs
View File

@@ -2,7 +2,7 @@ use crate::parsed::visitor::VisitOrder;
use super::*;
impl<T> ExpressionVisitable<T, Reference> for Analyzed<T> {
impl<T> ExpressionVisitable<parsed::Expression<T, Reference>> for Analyzed<T> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut parsed::Expression<T, Reference>) -> ControlFlow<B>,
@@ -50,7 +50,7 @@ impl<T> ExpressionVisitable<T, Reference> for Analyzed<T> {
}
}
impl<T> ExpressionVisitable<T, Reference> for Identity<T> {
impl<T> ExpressionVisitable<parsed::Expression<T, Reference>> for Identity<T> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut parsed::Expression<T, Reference>) -> ControlFlow<B>,

2
ast/src/asm_analysis/mod.rs
View File

@@ -540,7 +540,7 @@ pub enum FunctionStatement<T> {
Return(Return<T>),
}
impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for FunctionStatement<T> {
impl<T> ExpressionVisitable<Expression<T, ShiftedPolynomialReference<T>>> for FunctionStatement<T> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> std::ops::ControlFlow<B>
where
F: FnMut(&mut Expression<T, ShiftedPolynomialReference<T>>) -> std::ops::ControlFlow<B>,

42
ast/src/parsed/visitor.rs
View File

@@ -14,12 +14,12 @@ pub enum VisitOrder {
/// A trait to be implemented by an AST node.
/// The idea is that it calls a callback function on each of the sub-nodes
/// that are expressions.
pub trait ExpressionVisitable<T, Ref> {
pub trait ExpressionVisitable<Expr> {
/// Traverses the AST and calls `f` on each Expression in pre-order,
/// potentially break early and return a value.
fn pre_visit_expressions_return_mut<F, B>(&mut self, f: &mut F) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
F: FnMut(&mut Expr) -> ControlFlow<B>,
{
self.visit_expressions_mut(f, VisitOrder::Pre)
}
@@ -27,7 +27,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// Traverses the AST and calls `f` on each Expression in pre-order.
fn pre_visit_expressions_mut<F>(&mut self, f: &mut F)
where
F: FnMut(&mut Expression<T, Ref>),
F: FnMut(&mut Expr),
{
self.pre_visit_expressions_return_mut(&mut move |e| {
f(e);
@@ -39,7 +39,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// potentially break early and return a value.
fn pre_visit_expressions_return<F, B>(&self, f: &mut F) -> ControlFlow<B>
where
F: FnMut(&Expression<T, Ref>) -> ControlFlow<B>,
F: FnMut(&Expr) -> ControlFlow<B>,
{
self.visit_expressions(f, VisitOrder::Pre)
}
@@ -47,7 +47,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// Traverses the AST and calls `f` on each Expression in pre-order.
fn pre_visit_expressions<F>(&self, f: &mut F)
where
F: FnMut(&Expression<T, Ref>),
F: FnMut(&Expr),
{
self.pre_visit_expressions_return(&mut move |e| {
f(e);
@@ -59,7 +59,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// potentially break early and return a value.
fn post_visit_expressions_return_mut<F, B>(&mut self, f: &mut F) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
F: FnMut(&mut Expr) -> ControlFlow<B>,
{
self.visit_expressions_mut(f, VisitOrder::Post)
}
@@ -67,7 +67,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// Traverses the AST and calls `f` on each Expression in post-order.
fn post_visit_expressions_mut<F>(&mut self, f: &mut F)
where
F: FnMut(&mut Expression<T, Ref>),
F: FnMut(&mut Expr),
{
self.post_visit_expressions_return_mut(&mut move |e| {
f(e);
@@ -79,7 +79,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// potentially break early and return a value.
fn post_visit_expressions_return<F, B>(&self, f: &mut F) -> ControlFlow<B>
where
F: FnMut(&Expression<T, Ref>) -> ControlFlow<B>,
F: FnMut(&Expr) -> ControlFlow<B>,
{
self.visit_expressions(f, VisitOrder::Post)
}
@@ -87,7 +87,7 @@ pub trait ExpressionVisitable<T, Ref> {
/// Traverses the AST and calls `f` on each Expression in post-order.
fn post_visit_expressions<F>(&self, f: &mut F)
where
F: FnMut(&Expression<T, Ref>),
F: FnMut(&Expr),
{
self.post_visit_expressions_return(&mut move |e| {
f(e);
@@ -97,14 +97,14 @@ pub trait ExpressionVisitable<T, Ref> {
fn visit_expressions<F, B>(&self, f: &mut F, order: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&Expression<T, Ref>) -> ControlFlow<B>;
F: FnMut(&Expr) -> ControlFlow<B>;
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, order: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>;
F: FnMut(&mut Expr) -> ControlFlow<B>;
}
impl<T, Ref> ExpressionVisitable<T, Ref> for Expression<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for Expression<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
@@ -182,7 +182,7 @@ impl<T, Ref> ExpressionVisitable<T, Ref> for Expression<T, Ref> {
}
}
impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for PilStatement<T> {
impl<T> ExpressionVisitable<Expression<T, ShiftedPolynomialReference<T>>> for PilStatement<T> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, ShiftedPolynomialReference<T>>) -> ControlFlow<B>,
@@ -256,7 +256,7 @@ impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for PilStatement<T
}
}
impl<T, Ref> ExpressionVisitable<T, Ref> for SelectedExpressions<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for SelectedExpressions<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
@@ -280,7 +280,7 @@ impl<T, Ref> ExpressionVisitable<T, Ref> for SelectedExpressions<T, Ref> {
}
}
impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for FunctionDefinition<T> {
impl<T> ExpressionVisitable<Expression<T>> for FunctionDefinition<T> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T>) -> ControlFlow<B>,
@@ -308,7 +308,7 @@ impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for FunctionDefini
}
}
impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for ArrayExpression<T> {
impl<T> ExpressionVisitable<Expression<T>> for ArrayExpression<T> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T>) -> ControlFlow<B>,
@@ -342,7 +342,7 @@ impl<T> ExpressionVisitable<T, ShiftedPolynomialReference<T>> for ArrayExpressio
}
}
impl<T, Ref> ExpressionVisitable<T, Ref> for LambdaExpression<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for LambdaExpression<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
@@ -358,7 +358,7 @@ impl<T, Ref> ExpressionVisitable<T, Ref> for LambdaExpression<T, Ref> {
}
}
impl<T, Ref> ExpressionVisitable<T, Ref> for ArrayLiteral<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for ArrayLiteral<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
@@ -378,7 +378,7 @@ impl<T, Ref> ExpressionVisitable<T, Ref> for ArrayLiteral<T, Ref> {
}
}
impl<T, Ref> ExpressionVisitable<T, Ref> for FunctionCall<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for FunctionCall<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
@@ -398,7 +398,7 @@ impl<T, Ref> ExpressionVisitable<T, Ref> for FunctionCall<T, Ref> {
}
}
impl<T, Ref> ExpressionVisitable<T, Ref> for MatchArm<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for MatchArm<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,
@@ -416,7 +416,7 @@ impl<T, Ref> ExpressionVisitable<T, Ref> for MatchArm<T, Ref> {
}
}
impl<T, Ref> ExpressionVisitable<T, Ref> for MatchPattern<T, Ref> {
impl<T, Ref> ExpressionVisitable<Expression<T, Ref>> for MatchPattern<T, Ref> {
fn visit_expressions_mut<F, B>(&mut self, f: &mut F, o: VisitOrder) -> ControlFlow<B>
where
F: FnMut(&mut Expression<T, Ref>) -> ControlFlow<B>,