feat: evaluator type mismatch error

DeveloperC286 · DeveloperC286 · commit 15daf2b341f1 · 2020-09-26T01:03:46.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust_monkey_interpreter"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["C <DeveloperC@protonmail.com>"]
 edition = "2018"
 
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Rust Monkey Interpreter
-[![pipeline status](https://img.shields.io/badge/Version-0.12.0-blue)](https://gitlab.com/DeveloperC/rust_monkey_interpreter/commits/master) [![pipeline status](https://gitlab.com/DeveloperC/rust_monkey_interpreter/badges/master/pipeline.svg)](https://gitlab.com/DeveloperC/rust_monkey_interpreter/commits/master) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![pipeline status](https://img.shields.io/badge/Version-0.13.0-blue)](https://gitlab.com/DeveloperC/rust_monkey_interpreter/commits/master) [![pipeline status](https://gitlab.com/DeveloperC/rust_monkey_interpreter/badges/master/pipeline.svg)](https://gitlab.com/DeveloperC/rust_monkey_interpreter/commits/master) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 ![The Monkey Programming Language Logo](https://cloud.githubusercontent.com/assets/1013641/22617482/9c60c27c-eb09-11e6-9dfa-b04c7fe498ea.png)
 
diff --git a/src/evaluator/infix/mod.rs b/src/evaluator/infix/mod.rs
@@ -4,55 +4,51 @@ use crate::syntax_analysis::abstract_syntax_tree::syntax_tree_node::*;
 
 pub fn evaluate(left_hand: Expression, operator_token: Token, right_hand: Expression) -> Object {
     match crate::evaluator::evaluate_expression(left_hand) {
-        Object::INTEGER { value } => {
-            let left_value = value;
+        Object::INTEGER { value: left_value } => {
             match crate::evaluator::evaluate_expression(right_hand) {
-                Object::INTEGER { value } => {
-                    let right_value = value;
-                    match operator_token {
-                        Token::PLUS => Object::INTEGER {
-                            value: left_value + right_value,
-                        },
-                        Token::MINUS => Object::INTEGER {
-                            value: left_value - right_value,
-                        },
-                        Token::MULTIPLY => Object::INTEGER {
-                            value: left_value * right_value,
-                        },
-                        Token::DIVIDE => Object::INTEGER {
-                            value: left_value / right_value,
-                        },
-                        Token::GREATER_THAN => match left_value > right_value {
-                            true => Object::TRUE,
-                            false => Object::FALSE,
-                        },
-                        Token::LESSER_THAN => match left_value < right_value {
-                            true => Object::TRUE,
-                            false => Object::FALSE,
-                        },
-                        Token::EQUALS => match left_value == right_value {
-                            true => Object::TRUE,
-                            false => Object::FALSE,
-                        },
-                        Token::NOT_EQUALS => match left_value != right_value {
-                            true => Object::TRUE,
-                            false => Object::FALSE,
-                        },
-                        _ => Object::NULL,
-                    }
-                }
-                _ => Object::NULL,
+                Object::INTEGER { value: right_value } => match operator_token {
+                    Token::PLUS => Object::INTEGER {
+                        value: left_value + right_value,
+                    },
+                    Token::MINUS => Object::INTEGER {
+                        value: left_value - right_value,
+                    },
+                    Token::MULTIPLY => Object::INTEGER {
+                        value: left_value * right_value,
+                    },
+                    Token::DIVIDE => Object::INTEGER {
+                        value: left_value / right_value,
+                    },
+                    Token::GREATER_THAN => match left_value > right_value {
+                        true => Object::TRUE,
+                        false => Object::FALSE,
+                    },
+                    Token::LESSER_THAN => match left_value < right_value {
+                        true => Object::TRUE,
+                        false => Object::FALSE,
+                    },
+                    Token::EQUALS => match left_value == right_value {
+                        true => Object::TRUE,
+                        false => Object::FALSE,
+                    },
+                    Token::NOT_EQUALS => match left_value != right_value {
+                        true => Object::TRUE,
+                        false => Object::FALSE,
+                    },
+                    _ => Object::NULL,
+                },
+                _ => Object::TYPE_MISMATCH,
             }
         }
         Object::TRUE => match crate::evaluator::evaluate_expression(right_hand) {
             Object::TRUE => evaluate_same_boolean(operator_token),
             Object::FALSE => evaluate_opposite_boolean(operator_token),
-            _ => Object::NULL,
+            _ => Object::TYPE_MISMATCH,
         },
         Object::FALSE => match crate::evaluator::evaluate_expression(right_hand) {
             Object::FALSE => evaluate_same_boolean(operator_token),
             Object::TRUE => evaluate_opposite_boolean(operator_token),
-            _ => Object::NULL,
+            _ => Object::TYPE_MISMATCH,
         },
         _ => Object::NULL,
     }
diff --git a/src/evaluator/infix/tests/mod.rs b/src/evaluator/infix/tests/mod.rs
@@ -46,3 +46,21 @@ fn test_evaluator_infix_integer_expressions(code: &str, snapshot_name: &str) {
 fn test_evaluator_infix_boolean_expressions(code: &str, snapshot_name: &str) {
     assert_expected_returned_object!(code, snapshot_name);
 }
+
+#[rstest(
+    code,
+    snapshot_name,
+    case("(1 > 2) == 5", "test_evaluator_infix_type_mismatch_expressions_case1"),
+    case(
+        "5 + TRUE; 5 + 10;",
+        "test_evaluator_infix_type_mismatch_expressions_case2"
+    ),
+    case("FALSE - 10;", "test_evaluator_infix_type_mismatch_expressions_case3"),
+    case(
+        "if (10 > 1) { return TRUE + 5; } return 1;",
+        "test_evaluator_infix_type_mismatch_expressions_case4"
+    )
+)]
+fn test_evaluator_infix_type_mismatch_expressions(code: &str, snapshot_name: &str) {
+    assert_expected_returned_object!(code, snapshot_name);
+}
diff --git a/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case1.snap b/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case1.snap
@@ -0,0 +1,5 @@
+---
+source: src/evaluator/infix/tests/mod.rs
+expression: "crate::evaluator::evaluate(crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_analysis::get_tokens(code.to_string())))"
+---
+"TYPE_MISMATCH"
diff --git a/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case2.snap b/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case2.snap
@@ -0,0 +1,5 @@
+---
+source: src/evaluator/infix/tests/mod.rs
+expression: "crate::evaluator::evaluate(crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_analysis::get_tokens(code.to_string())))"
+---
+"TYPE_MISMATCH"
diff --git a/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case3.snap b/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case3.snap
@@ -0,0 +1,5 @@
+---
+source: src/evaluator/infix/tests/mod.rs
+expression: "crate::evaluator::evaluate(crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_analysis::get_tokens(code.to_string())))"
+---
+"TYPE_MISMATCH"
diff --git a/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case4.snap b/src/evaluator/infix/tests/snapshots/rust_monkey_interpreter__evaluator__infix__tests__test_evaluator_infix_type_mismatch_expressions_case4.snap
@@ -0,0 +1,5 @@
+---
+source: src/evaluator/infix/tests/mod.rs
+expression: "crate::evaluator::evaluate(crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_analysis::get_tokens(code.to_string())))"
+---
+"TYPE_MISMATCH"
diff --git a/src/evaluator/mod.rs b/src/evaluator/mod.rs
@@ -17,9 +17,13 @@ pub fn evaluate(abstract_syntax_tree: AbstractSyntaxTree) -> Object {
     for syntax_tree_node in abstract_syntax_tree.abstract_syntax_tree {
         object = evaluate_node(syntax_tree_node);
 
-        if let Object::RETURN { value } = object.clone() {
-            object = *value;
-            break;
+        match object.clone() {
+            Object::RETURN { value } => {
+                object = *value;
+                break;
+            }
+            Object::TYPE_MISMATCH => break,
+            _ => {}
         }
     }
 
@@ -32,8 +36,9 @@ fn evaluate_block(block: Block) -> Object {
     for syntax_tree_node in block.nodes {
         object = evaluate_node(syntax_tree_node);
 
-        if let Object::RETURN { value: _ } = object.clone() {
-            break;
+        match object.clone() {
+            Object::RETURN { value: _ } | Object::TYPE_MISMATCH => break,
+            _ => {}
         }
     }
 
diff --git a/src/evaluator/object/mod.rs b/src/evaluator/object/mod.rs
@@ -1,10 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+#[allow(non_camel_case_types)]
 pub enum Object {
     RETURN { value: Box<Object> },
     INTEGER { value: i32 },
     TRUE,
     FALSE,
     NULL,
+    TYPE_MISMATCH,
 }

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,13 @@ pub fn evaluate(abstract_syntax_tree: AbstractSyntaxTree) -> Object {`
`17`	`17`	`for syntax_tree_node in abstract_syntax_tree.abstract_syntax_tree {`
`18`	`18`	`object = evaluate_node(syntax_tree_node);`
`19`	`19`
`20`		`- if let Object::RETURN { value } = object.clone() {`
`21`		`- object = *value;`
`22`		`- break;`
	`20`	`+ match object.clone() {`
	`21`	`+ Object::RETURN { value } => {`
	`22`	`+ object = *value;`
	`23`	`+ break;`
	`24`	`+ }`
	`25`	`+ Object::TYPE_MISMATCH => break,`
	`26`	`+ _ => {}`
`23`	`27`	`}`
`24`	`28`	`}`
`25`	`29`
`@@ -32,8 +36,9 @@ fn evaluate_block(block: Block) -> Object {`
`32`	`36`	`for syntax_tree_node in block.nodes {`
`33`	`37`	`object = evaluate_node(syntax_tree_node);`
`34`	`38`
`35`		`- if let Object::RETURN { value: _ } = object.clone() {`
`36`		`- break;`
	`39`	`+ match object.clone() {`
	`40`	`+ Object::RETURN { value: _ } \| Object::TYPE_MISMATCH => break,`
	`41`	`+ _ => {}`
`37`	`42`	`}`
`38`	`43`	`}`
`39`	`44`