1 files changed, 24 insertions, 10 deletions

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index 589be37..9e0d033 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -3,8 +3,8 @@
 use crate::{ast, Wrap};
 use std::{collections::HashMap, fmt, io};
 
-mod builtins;
 mod analysis;
+mod builtins;
 #[cfg(test)]
 mod test;
 
@@ -453,7 +453,8 @@ pub struct Context<'s> {
     cursor: Option<tree_sitter::TreeCursor<'static>>,
     tree: Option<&'static tree_sitter::Tree>,
     cache: HashMap<NodeId, tree_sitter::Node<'static>>,
-    output_stream: Option<Box<dyn io::Write + 's>>,
+    output_stream: Box<dyn io::Write + 's>,
+    error_stream: Box<dyn io::Write + 's>,
 }
 
 impl<'s> fmt::Debug for Context<'s> {
@@ -484,7 +485,8 @@ impl<'s> Context<'s> {
             cursor: None,
             tree: None,
             cache: HashMap::default(),
-            output_stream: Some(Box::new(io::stdout()) as Box<dyn io::Write + 's>),
+            output_stream: Box::new(io::stdout()) as Box<dyn io::Write + 's>,
+            error_stream: Box::new(io::stderr()) as Box<dyn io::Write + 's>,
         }
     }
 
@@ -539,7 +541,12 @@ impl<'s> Context<'s> {
     }
 
     pub fn with_output_stream(mut self, stream: Box<dyn io::Write + 's>) -> Self {
-        self.output_stream = Some(stream);
+        self.output_stream = stream;
+        self
+    }
+
+    pub fn with_error_stream(mut self, stream: Box<dyn io::Write + 's>) -> Self {
+        self.error_stream = stream;
         self
     }
 
@@ -793,13 +800,11 @@ impl<'s> Context<'s> {
             .unwrap_or_default()
     }
 
-    pub fn analyze(&mut self) -> Result {
-        let analysis = analysis::run(&*self);
-        analysis.print();
-        Err(Error::Analysis)
+    pub fn analyze(&mut self) -> analysis::Analysis {
+        analysis::run(&*self)
     }
 
-    pub fn eval(&mut self) -> Result {
+    fn eval_program(&mut self) -> Result {
         let program = std::mem::take(&mut self.program);
         let mut has_next = true;
         let mut postorder = Vec::new();
@@ -847,6 +852,15 @@ impl<'s> Context<'s> {
 
         Ok(Value::Unit)
     }
+
+    pub fn eval(&mut self) -> Result {
+        let analysis = self.analyze();
+        write!(self.error_stream, "{analysis}").unwrap();
+        if analysis.contains_error() {
+            return Err(Error::Analysis);
+        }
+        self.eval_program()
+    }
 }
 
 pub fn evaluate(file: &str, program: &str, language: tree_sitter::Language) -> Result {
@@ -860,8 +874,8 @@ pub fn evaluate(file: &str, program: &str, language: tree_sitter::Language) -> R
         .with_input(file.to_owned())
         .with_tree(tree)
         .with_output_stream(Box::new(io::stdout()))
+        .with_error_stream(Box::new(io::stderr()))
         .with_program(program);
 
-    ctx.analyze()?;
     ctx.eval()
 }