fix: introducing evaluation errors

Author: DeveloperC286

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "monkey_interpreter"
-version = "0.15.2"
+version = "0.15.3"
 description = "Implementation of an interpreter for the Monkey language written in Rust, currently under active development."
 authors = ["C <[email protected]>"]
 edition = "2021"

Cargo.toml

@@ -1,5 +1,5 @@
 # Monkey Interpreter
-[![pipeline status](https://img.shields.io/badge/Version-0.15.2-blue)](https://gitlab.com/DeveloperC/monkey_interpreter/commits/master) [![pipeline status](https://gitlab.com/DeveloperC/monkey_interpreter/badges/master/pipeline.svg)](https://gitlab.com/DeveloperC/monkey_interpreter/commits/master) [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![License: AGPL v3](https://img.shields.io/badge/License-AGPLv3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
+[![pipeline status](https://img.shields.io/badge/Version-0.15.3-blue)](https://gitlab.com/DeveloperC/monkey_interpreter/commits/master) [![pipeline status](https://gitlab.com/DeveloperC/monkey_interpreter/badges/master/pipeline.svg)](https://gitlab.com/DeveloperC/monkey_interpreter/commits/master) [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![License: AGPL v3](https://img.shields.io/badge/License-AGPLv3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 
 
 ![The Monkey Programming Language Logo](https://cloud.githubusercontent.com/assets/1013641/22617482/9c60c27c-eb09-11e6-9dfa-b04c7fe498ea.png)

README.md

@@ -1,13 +1,14 @@
+use crate::evaluator::model::evaluation_error::EvaluationError;
 use crate::evaluator::model::object::Object;
 use crate::evaluator::Evaluator;
 use crate::lexical_analysis::model::token::Token;
 
 impl Evaluator {
-    pub(super) fn evaluate_boolean(&self, boolean_token: Token) -> Object {
+    pub(super) fn evaluate_boolean(&self, boolean_token: Token) -> Result<Object, EvaluationError> {
         match boolean_token {
-            Token::True => Object::True,
-            Token::False => Object::False,
-            _ => panic!("Boolean token not a boolean token."),
+            Token::True => Ok(Object::True),
+            Token::False => Ok(Object::False),
+            _ => Err(EvaluationError::NotBooleanToken),
         }
     }
 }

src/evaluator/expression/boolean/mod.rs

@@ -1,6 +1,8 @@
 ---
 source: src/evaluator/expression/boolean/tests/mod.rs
-expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code)))"
+expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code).unwrap()).unwrap())"
 
 ---
-True
+Ok(
+    True,
+)

src/evaluator/expression/boolean/tests/snapshots/monkey_interpreter__evaluator__expression__boolean__tests__test_evaluator_boolean_nodes_case1.snap

@@ -1,6 +1,8 @@
 ---
 source: src/evaluator/expression/boolean/tests/mod.rs
-expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code)))"
+expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code).unwrap()).unwrap())"
 
 ---
-False
+Ok(
+    False,
+)

src/evaluator/expression/boolean/tests/snapshots/monkey_interpreter__evaluator__expression__boolean__tests__test_evaluator_boolean_nodes_case2.snap

@@ -1,4 +1,5 @@
-use crate::evaluator::model::object::{ErrorType, Object};
+use crate::evaluator::model::evaluation_error::EvaluationError;
+use crate::evaluator::model::object::Object;
 use crate::evaluator::Evaluator;
 use crate::syntax_analysis::model::syntax_tree_node::Expression;
 
@@ -7,31 +8,23 @@ impl Evaluator {
         &mut self,
         function: Expression,
         arguments: Vec<Expression>,
-    ) -> Object {
-        match self.evaluate_expression(function) {
+    ) -> Result<Object, EvaluationError> {
+        match self.evaluate_expression(function)? {
             Object::Function { parameters, block } => {
                 self.environment.push();
 
                 for (argument, parameter_identifier) in arguments.into_iter().zip(parameters) {
-                    let argument_evaluation = self.evaluate_expression(argument);
-
-                    if let Object::Error { error_type } = argument_evaluation.clone() {
-                        self.environment.pop();
-                        return Object::Error { error_type };
-                    }
+                    let argument_evaluation = self.evaluate_expression(argument)?;
 
                     self.environment
                         .set(parameter_identifier, argument_evaluation);
                 }
 
-                let block_call_evaluation = self.evaluate_block(block);
+                let block_call_evaluation = self.evaluate_block(block)?;
                 self.environment.pop();
-                block_call_evaluation
+                Ok(block_call_evaluation)
             }
-            Object::Error { error_type } => Object::Error { error_type },
-            _ => Object::Error {
-                error_type: ErrorType::UncallableObject,
-            },
+            _ => Err(EvaluationError::UncallableObject),
         }
     }
 }

src/evaluator/expression/call/mod.rs

@@ -1,8 +1,10 @@
 ---
 source: src/evaluator/expression/call/tests/mod.rs
-expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code)))"
+expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code).unwrap()).unwrap())"
 
 ---
-Integer {
-    value: 5,
-}
+Ok(
+    Integer {
+        value: 5,
+    },
+)

src/evaluator/expression/call/tests/snapshots/monkey_interpreter__evaluator__expression__call__tests__test_evaluator_call_nodes_case1.snap

@@ -1,8 +1,10 @@
 ---
 source: src/evaluator/expression/call/tests/mod.rs
-expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code)))"
+expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code).unwrap()).unwrap())"
 
 ---
-Integer {
-    value: 5,
-}
+Ok(
+    Integer {
+        value: 5,
+    },
+)

src/evaluator/expression/call/tests/snapshots/monkey_interpreter__evaluator__expression__call__tests__test_evaluator_call_nodes_case2.snap

@@ -1,8 +1,10 @@
 ---
 source: src/evaluator/expression/call/tests/mod.rs
-expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code)))"
+expression: "evaluator.evaluate(crate::syntax_analysis::SyntaxAnalysis::from(crate::lexical_analysis::LexicalAnalysis::from(code).unwrap()).unwrap())"
 
 ---
-Integer {
-    value: 10,
-}
+Ok(
+    Integer {
+        value: 10,
+    },
+)