Fix errors from merge

egraphs-good · Oct 14, 2024 · 3f687e1 · 3f687e1
1 parent 361e9a3
commit 3f687e1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/actions.rs b/src/actions.rs
@@ -212,7 +212,7 @@ impl EGraph {
         stack: &mut Vec<Value>,
         set_cost: bool,
     ) -> Result<(), Error> {
-        let i64sort: Arc<I64Sort> = self.type_info().get_sort_nofail();
+        let i64sort: Arc<I64Sort> = self.type_info.get_sort_nofail();
         let function = self.functions.get_mut(&table).unwrap();
 
         let new_len = stack.len() - function.schema.input.len();

diff --git a/src/ast/parse.lalrpop b/src/ast/parse.lalrpop
@@ -91,7 +91,6 @@ Command: Command = {
         => Command::Simplify { span: Span(srcfile.clone(), lo, hi), expr, schedule },
     <lo:LParen> "query-extract" <variants:(":variants" <UNum>)?> <expr:Expr> <hi:RParen> => Command::QueryExtract { span: Span(srcfile.clone(), lo, hi), expr, variants: variants.unwrap_or(0) },
     <lo:LParen> "check" <facts:(Fact)*> <hi:RParen> => Command::Check(Span(srcfile.clone(), lo, hi), facts),
-    LParen "check-proof" RParen => Command::CheckProof,
       <lo:LParen> "run-schedule" <scheds:Schedule*> <hi:RParen> =>
         Command::RunSchedule(Schedule::Sequence(Span(srcfile.clone(), lo, hi), scheds)),
     LParen "print-stats" RParen => Command::PrintOverallStatistics,

diff --git a/src/constraint.rs b/src/constraint.rs
@@ -356,7 +356,7 @@ impl Assignment<AtomTerm, ArcSort> {
                     .collect();
                 let resolved_call = if *is_cost {
                     ResolvedCall::from_resolution_func_types(head, &types, typeinfo)
-                        .ok_or_else(|| TypeError::UnboundFunction(*head))?
+                        .ok_or_else(|| TypeError::UnboundFunction(*head, span.clone()))?
                 } else {
                     types.push(rhs.output_type(typeinfo));
                     ResolvedCall::from_resolution(head, &types, typeinfo)