Merge pull request #554 from clyben/prettyprint

Prettyprinter
egraphs-good · Jun 20, 2024 · b919186 · b919186
2 parents cf0807b + d09a167
commit b919186
Show file tree

Hide file tree

Showing 16 changed files with 941 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dag_in_context/Cargo.lock b/dag_in_context/Cargo.lock
diff --git a/dag_in_context/Cargo.toml b/dag_in_context/Cargo.toml
@@ -22,3 +22,4 @@ symbol_table = { version = "0.3.0", features = ["global"] }
 rpds = "1.1.0"
 log = "0.4"
 env_logger = "0.11.3"
+insta = { version = "1.31.0", features = ["yaml"] }
diff --git a/dag_in_context/src/add_context.rs b/dag_in_context/src/add_context.rs
@@ -326,6 +326,7 @@ impl Expr {
                 out_ty.clone(),
                 body.add_ctx_with_cache(current_ctx, cache),
             )),
+            Expr::Symbolic(_) => panic!("found symbol"),
         };
         cache
             .with_ctx

diff --git a/dag_in_context/src/from_egglog.rs b/dag_in_context/src/from_egglog.rs
@@ -201,7 +201,7 @@ impl<'a> FromEgglog<'a> {
         })
     }
 
-    pub(crate) fn expr_from_egglog(&mut self, expr: Term) -> RcExpr {
+    pub fn expr_from_egglog(&mut self, expr: Term) -> RcExpr {
         if let Some(expr) = self.conversion_cache.get(&expr) {
             return expr.clone();
         }

diff --git a/dag_in_context/src/interpreter.rs b/dag_in_context/src/interpreter.rs
@@ -457,6 +457,7 @@ impl<'a> VirtualMachine<'a> {
                 let e_val = self.interpret_expr(e, arg);
                 self.interpret_call(func_name, &e_val)
             }
+            Expr::Symbolic(_) => panic!("found symbolic"),
         };
         self.eval_cache.insert(Rc::as_ptr(expr), res.clone());
         res

diff --git a/dag_in_context/src/lib.rs b/dag_in_context/src/lib.rs
@@ -30,6 +30,7 @@ pub(crate) mod type_analysis;
 pub mod typechecker;
 pub(crate) mod utility;
 use main_error::MainError;
+pub mod pretty_print;
 pub mod schedule;
 
 pub type Result = std::result::Result<(), MainError>;
@@ -105,7 +106,7 @@ fn print_with_intermediate_helper(
     }
 }
 
-pub(crate) fn print_with_intermediate_vars(termdag: &TermDag, term: Term) -> String {
+pub fn print_with_intermediate_vars(termdag: &TermDag, term: Term) -> String {
     let mut printed = String::new();
     let mut cache = HashMap::<Term, String>::new();
     let res = print_with_intermediate_helper(termdag, term, &mut cache, &mut printed);

diff --git a/dag_in_context/src/linearity.rs b/dag_in_context/src/linearity.rs
@@ -195,6 +195,7 @@ impl<'a> Extractor<'a> {
                 self.find_effectful_nodes_in_region(body, linearity)
             }
             Expr::Const(_, _, _) => panic!("Const has no effect"),
+            Expr::Symbolic(_) => panic!("found symbolic"),
         }
     }