Finish removal of generic visitor

polarity-lang · Apr 21, 2024 · 691142f · 691142f
1 parent 93f26a8
commit 691142f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 111 deletions.
diff --git a/lang/lifting/src/fv.rs b/lang/lifting/src/fv.rs
@@ -86,19 +86,22 @@ impl FV for ust::Match {
 }
 
 impl FV for ust::Case {
-    fn visit_fv(&self, _v: &mut USTVisitor) {
-        let ust::Case { info: _, name: _, args: _, body: _ } = self;
+    fn visit_fv(&self, v: &mut USTVisitor) {
+        let ust::Case { info: _, name: _, args, body } = self;
 
-        //body.visit_fv(v);
-        // TODO: The visitor context must be extended somehow.
+        v.bind_iter(args.params.iter(), |v| {
+            body.visit_fv(v);
+        })
     }
 }
 
 impl FV for ust::Motive {
     fn visit_fv(&self, v: &mut USTVisitor) {
         let ust::Motive { info: _, param, ret_typ } = self;
+
         param.visit_fv(v);
-        ret_typ.visit_fv(v);
+
+        v.bind_single(param, |v| ret_typ.visit_fv(v))
     }
 }
 
@@ -123,9 +126,8 @@ impl<T: FV> FV for Rc<T> {
 
 impl<T: FV> FV for Option<T> {
     fn visit_fv(&self, v: &mut USTVisitor) {
-        match self {
-            None => {}
-            Some(x) => x.visit_fv(v),
+        if let Some(x) = self {
+            x.visit_fv(v)
         }
     }
 }

diff --git a/lang/syntax/src/ctx/mod.rs b/lang/syntax/src/ctx/mod.rs
@@ -3,9 +3,7 @@ mod levels;
 mod map;
 pub mod map_idx;
 pub mod values;
-mod visit;
 
 pub use def::*;
 pub use levels::*;
 pub use map::*;
-pub use visit::*;
diff --git a/lang/syntax/src/ctx/visit.rs b/lang/syntax/src/ctx/visit.rs