From 8ef5a28aff26c8c6108c7a52d56c48117863adc1 Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Sat, 3 Mar 2018 00:25:08 -0800
Subject: [PATCH] Evaluator now only prints when a builtin print is called

---
 schala-lib/src/lib.rs     |  3 +--
 source_files/first.schala |  2 +-
 src/schala_lang/eval.rs   | 26 +++++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/schala-lib/src/lib.rs b/schala-lib/src/lib.rs
index e95a391..5b55adf 100644
--- a/schala-lib/src/lib.rs
+++ b/schala-lib/src/lib.rs
@@ -110,8 +110,7 @@ fn run_noninteractive(filename: &str, languages: Vec<Box<ProgrammingLanguageInte
       compilation_sequence(llvm_bytecode, filename);
     }
   } else {
-    let interpretor_output = language.evaluate_in_repl(&buffer, &options);
-    interpretor_output.print_to_screen();
+    language.evaluate_in_repl(&buffer, &options);
   }
 }
 
diff --git a/source_files/first.schala b/source_files/first.schala
index 4668e14..a56eac9 100644
--- a/source_files/first.schala
+++ b/source_files/first.schala
@@ -4,5 +4,5 @@ fn main() {
   a + b
 }
 
-main()
+print(main())
 
diff --git a/src/schala_lang/eval.rs b/src/schala_lang/eval.rs
index a5d6cae..c69baaa 100644
--- a/src/schala_lang/eval.rs
+++ b/src/schala_lang/eval.rs
@@ -167,6 +167,7 @@ impl<'a> State<'a> {
   fn eval_application(&mut self, f: Expression, arguments: Vec<FullyEvaluatedExpr>) -> EvalResult<FullyEvaluatedExpr> {
     use self::ExpressionType::*;
     match f {
+      Expression(Value(ref identifier), _) if self.is_builtin(identifier) =>  self.eval_builtin(identifier, arguments),
       Expression(Value(identifier), _) => {
         match self.lookup(&identifier) {
           Some(&ValueEntry::Function { ref body, ref param_names }) => {
@@ -190,7 +191,30 @@ impl<'a> State<'a> {
       x => Err(format!("Trying to apply {:?} which is not a function", x)),
     }
   }
-
+  fn is_builtin(&self, name: &Rc<String>) -> bool {
+    match &name.as_ref()[..] {
+      "print" | "println" => true,
+      _ => false
+    }
+  }
+  fn eval_builtin(&mut self, name: &Rc<String>, args: Vec<FullyEvaluatedExpr>) -> EvalResult<FullyEvaluatedExpr> {
+    use self::FullyEvaluatedExpr::*;
+    match &name.as_ref()[..] {
+      "print" => {
+        for arg in args {
+          print!("{}", arg.to_string());
+        }
+        Ok(Tuple(vec![]))
+      },
+      "println" => {
+        for arg in args {
+          println!("{}", arg.to_string());
+        }
+        Ok(Tuple(vec![]))
+      },
+      _ => unreachable!()
+    }
+  }
   fn eval_value(&mut self, name: Rc<String>) -> EvalResult<FullyEvaluatedExpr> {
     use self::ValueEntry::*;
     match self.lookup(&name) {