feat: initial statements parse expressions

DeveloperC286 · DeveloperC286 · commit 760bc407d401 · 2020-07-09T18:56:53.000Z
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.7.0"
+version = "0.8.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.7.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.8.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/syntax_analysis/abstract_syntax_tree/syntax_tree_node/mod.rs b/src/syntax_analysis/abstract_syntax_tree/syntax_tree_node/mod.rs
@@ -16,11 +16,11 @@ pub enum SyntaxTreeNode {
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub enum Statement {
     LET {
-        let_token: Token,
         identifier_token: Token,
+        expression: Box<Expression>,
     },
     RETURN {
-        return_token: Token,
+        expression: Box<Expression>,
     },
 }
 
diff --git a/src/syntax_analysis/mod.rs b/src/syntax_analysis/mod.rs
@@ -486,55 +486,53 @@ impl SyntaxAnalysis {
     fn parse_return_statement(&mut self) -> Option<SyntaxTreeNode> {
         debug!("Parsing a return statement.");
 
-        let return_token = self.current_token.clone();
         expect_token!(self, TokenType::RETURN, None);
 
-        //TODO handle expression.
-        loop {
-            match self.current_token.token_type {
-                TokenType::SEMI_COLON => {
-                    self.increment_token_index();
-                    break;
-                }
-                _ => {
-                    self.increment_token_index();
-                }
+        let expression = match self.parse_expression(ExpressionPrecedence::LOWEST) {
+            Some(expression) => expression,
+            None => {
+                syntax_error!(self, "".to_string());
+                return None;
             }
+        };
+
+        if self.current_token.token_type == TokenType::SEMI_COLON {
+            self.increment_token_index();
         }
 
         return Some(SyntaxTreeNode::STATEMENT {
-            statement: Statement::RETURN { return_token },
+            statement: Statement::RETURN {
+                expression: Box::new(expression),
+            },
         });
     }
 
     fn parse_let_statement(&mut self) -> Option<SyntaxTreeNode> {
         debug!("Parsing a let statement.");
 
-        let let_token = self.current_token.clone();
         expect_token!(self, TokenType::LET, None);
 
         let identifier_token = self.current_token.clone();
         expect_token!(self, TokenType::IDENTIFIER, None);
 
         expect_token!(self, TokenType::ASSIGN, None);
 
-        //TODO handle expression.
-        loop {
-            match self.current_token.token_type {
-                TokenType::SEMI_COLON => {
-                    self.increment_token_index();
-                    break;
-                }
-                _ => {
-                    self.increment_token_index();
-                }
+        let expression = match self.parse_expression(ExpressionPrecedence::LOWEST) {
+            Some(expression) => expression,
+            None => {
+                syntax_error!(self, "".to_string());
+                return None;
             }
+        };
+
+        if self.current_token.token_type == TokenType::SEMI_COLON {
+            self.increment_token_index();
         }
 
         return Some(SyntaxTreeNode::STATEMENT {
             statement: Statement::LET {
-                let_token,
                 identifier_token,
+                expression: Box::new(expression),
             },
         });
     }
diff --git a/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_combined_statements_case1.snap b/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_combined_statements_case1.snap
@@ -8,13 +8,17 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "LET": {
-            "let_token": {
-              "token_type": "LET",
-              "literal": "let"
-            },
             "identifier_token": {
               "token_type": "IDENTIFIER",
               "literal": "x"
+            },
+            "expression": {
+              "INTEGER": {
+                "integer_token": {
+                  "token_type": "INTEGER",
+                  "literal": "5"
+                }
+              }
             }
           }
         }
@@ -24,9 +28,13 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "RETURN": {
-            "return_token": {
-              "token_type": "RETURN",
-              "literal": "RETURN"
+            "expression": {
+              "INTEGER": {
+                "integer_token": {
+                  "token_type": "INTEGER",
+                  "literal": "5"
+                }
+              }
             }
           }
         }
diff --git a/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_let_statements_case1.snap b/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_let_statements_case1.snap
@@ -1,20 +1,24 @@
 ---
 source: src/syntax_analysis/tests.rs
-expression: returned_abstract_syntax_tree_1
+expression: returned_abstract_syntax_tree
 ---
 {
   "abstract_syntax_tree": [
     {
       "STATEMENT": {
         "statement": {
           "LET": {
-            "let_token": {
-              "token_type": "LET",
-              "literal": "let"
-            },
             "identifier_token": {
               "token_type": "IDENTIFIER",
               "literal": "x"
+            },
+            "expression": {
+              "INTEGER": {
+                "integer_token": {
+                  "token_type": "INTEGER",
+                  "literal": "5"
+                }
+              }
             }
           }
         }
diff --git a/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_let_statements_case2.snap b/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_let_statements_case2.snap
@@ -8,13 +8,17 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "LET": {
-            "let_token": {
-              "token_type": "LET",
-              "literal": "let"
-            },
             "identifier_token": {
               "token_type": "IDENTIFIER",
               "literal": "x"
+            },
+            "expression": {
+              "INTEGER": {
+                "integer_token": {
+                  "token_type": "INTEGER",
+                  "literal": "5"
+                }
+              }
             }
           }
         }
@@ -24,13 +28,33 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "LET": {
-            "let_token": {
-              "token_type": "LET",
-              "literal": "let"
-            },
             "identifier_token": {
               "token_type": "IDENTIFIER",
               "literal": "z"
+            },
+            "expression": {
+              "INFIX": {
+                "left_hand_expression": {
+                  "INTEGER": {
+                    "integer_token": {
+                      "token_type": "INTEGER",
+                      "literal": "7"
+                    }
+                  }
+                },
+                "operator_token": {
+                  "token_type": "PLUS",
+                  "literal": "+"
+                },
+                "right_hand_expression": {
+                  "INTEGER": {
+                    "integer_token": {
+                      "token_type": "INTEGER",
+                      "literal": "10"
+                    }
+                  }
+                }
+              }
             }
           }
         }
diff --git a/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_return_statements_case1.snap b/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_return_statements_case1.snap
@@ -8,9 +8,13 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "RETURN": {
-            "return_token": {
-              "token_type": "RETURN",
-              "literal": "RETURN"
+            "expression": {
+              "INTEGER": {
+                "integer_token": {
+                  "token_type": "INTEGER",
+                  "literal": "5"
+                }
+              }
             }
           }
         }
diff --git a/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_return_statements_case2.snap b/src/syntax_analysis/snapshots/rust_monkey_interpreter__syntax_analysis__tests__test_syntax_analysis_for_return_statements_case2.snap
@@ -8,9 +8,13 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "RETURN": {
-            "return_token": {
-              "token_type": "RETURN",
-              "literal": "RETURN"
+            "expression": {
+              "INTEGER": {
+                "integer_token": {
+                  "token_type": "INTEGER",
+                  "literal": "5"
+                }
+              }
             }
           }
         }
@@ -20,9 +24,13 @@ expression: returned_abstract_syntax_tree
       "STATEMENT": {
         "statement": {
           "RETURN": {
-            "return_token": {
-              "token_type": "RETURN",
-              "literal": "return"
+            "expression": {
+              "IDENTIFIER": {
+                "identifier_token": {
+                  "token_type": "IDENTIFIER",
+                  "literal": "x"
+                }
+              }
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,13 @@ expression: returned_abstract_syntax_tree`
`8`	`8`	`"STATEMENT": {`
`9`	`9`	`"statement": {`
`10`	`10`	`"RETURN": {`
`11`		`- "return_token": {`
`12`		`- "token_type": "RETURN",`
`13`		`- "literal": "RETURN"`
	`11`	`+ "expression": {`
	`12`	`+ "INTEGER": {`
	`13`	`+ "integer_token": {`
	`14`	`+ "token_type": "INTEGER",`
	`15`	`+ "literal": "5"`
	`16`	`+ }`
	`17`	`+ }`
`14`	`18`	`}`
`15`	`19`	`}`
`16`	`20`	`}`