refactor: moved Block from enum to strut

DeveloperC286 · DeveloperC286 · commit 900205533e74 · 2020-08-10T23:38:39.000+01:00
diff --git a/src/evaluator/if_statement/mod.rs b/src/evaluator/if_statement/mod.rs
@@ -4,14 +4,11 @@ use crate::syntax_analysis::abstract_syntax_tree::syntax_tree_node::*;
 pub fn evaluate(condition: Expression, consequence: Block, alternative: Option<Block>) -> Object {
     match crate::evaluator::evaluate_expression(condition) {
         Object::NULL | Object::FALSE => match alternative {
-            Some(block) => match block {
-                Block::BLOCK { blocks } => crate::evaluator::evaluate_nodes(blocks),
-            },
+            Some(block) => crate::evaluator::evaluate_nodes(block.blocks),
+
             None => Object::NULL,
         },
-        _ => match consequence {
-            Block::BLOCK { blocks } => crate::evaluator::evaluate_nodes(blocks),
-        },
+        _ => crate::evaluator::evaluate_nodes(consequence.blocks),
     }
 }
 
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
@@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize};
 use crate::lexical_analysis::token::Token;
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub enum Block {
-    BLOCK { blocks: Vec<SyntaxTreeNode> },
+pub struct Block {
+    pub blocks: Vec<SyntaxTreeNode>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
diff --git a/src/syntax_analysis/expressions/function_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__function_expression__tests__test_syntax_analysis_for_function_expression_case1.snap b/src/syntax_analysis/expressions/function_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__function_expression__tests__test_syntax_analysis_for_function_expression_case1.snap
@@ -29,37 +29,35 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana
               }
             ],
             "block": {
-              "BLOCK": {
-                "blocks": [
-                  {
-                    "EXPRESSION": {
-                      "expression": {
-                        "INFIX": {
-                          "left_hand": {
-                            "IDENTIFIER": {
-                              "identifier_token": {
-                                "IDENTIFIER": {
-                                  "literal": "x"
-                                }
+              "blocks": [
+                {
+                  "EXPRESSION": {
+                    "expression": {
+                      "INFIX": {
+                        "left_hand": {
+                          "IDENTIFIER": {
+                            "identifier_token": {
+                              "IDENTIFIER": {
+                                "literal": "x"
                               }
                             }
-                          },
-                          "operator_token": "PLUS",
-                          "right_hand": {
-                            "IDENTIFIER": {
-                              "identifier_token": {
-                                "IDENTIFIER": {
-                                  "literal": "y"
-                                }
+                          }
+                        },
+                        "operator_token": "PLUS",
+                        "right_hand": {
+                          "IDENTIFIER": {
+                            "identifier_token": {
+                              "IDENTIFIER": {
+                                "literal": "y"
                               }
                             }
                           }
                         }
                       }
                     }
                   }
-                ]
-              }
+                }
+              ]
             }
           }
         }
diff --git a/src/syntax_analysis/expressions/function_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__function_expression__tests__test_syntax_analysis_for_function_expression_case2.snap b/src/syntax_analysis/expressions/function_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__function_expression__tests__test_syntax_analysis_for_function_expression_case2.snap
@@ -10,9 +10,7 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana
           "FUNCTION": {
             "parameters": [],
             "block": {
-              "BLOCK": {
-                "blocks": []
-              }
+              "blocks": []
             }
           }
         }
diff --git a/src/syntax_analysis/expressions/function_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__function_expression__tests__test_syntax_analysis_for_function_expression_case3.snap b/src/syntax_analysis/expressions/function_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__function_expression__tests__test_syntax_analysis_for_function_expression_case3.snap
@@ -20,9 +20,7 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana
               }
             ],
             "block": {
-              "BLOCK": {
-                "blocks": []
-              }
+              "blocks": []
             }
           }
         }
diff --git a/src/syntax_analysis/expressions/if_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__if_expression__tests__test_syntax_analysis_for_if_expression_case1.snap b/src/syntax_analysis/expressions/if_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__if_expression__tests__test_syntax_analysis_for_if_expression_case1.snap
@@ -32,23 +32,21 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana
               }
             },
             "consequence": {
-              "BLOCK": {
-                "blocks": [
-                  {
-                    "EXPRESSION": {
-                      "expression": {
-                        "IDENTIFIER": {
-                          "identifier_token": {
-                            "IDENTIFIER": {
-                              "literal": "x"
-                            }
+              "blocks": [
+                {
+                  "EXPRESSION": {
+                    "expression": {
+                      "IDENTIFIER": {
+                        "identifier_token": {
+                          "IDENTIFIER": {
+                            "literal": "x"
                           }
                         }
                       }
                     }
                   }
-                ]
-              }
+                }
+              ]
             },
             "alternative": null
           }
diff --git a/src/syntax_analysis/expressions/if_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__if_expression__tests__test_syntax_analysis_for_if_expression_case2.snap b/src/syntax_analysis/expressions/if_expression/snapshots/rust_monkey_interpreter__syntax_analysis__expressions__if_expression__tests__test_syntax_analysis_for_if_expression_case2.snap
@@ -32,42 +32,38 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana
               }
             },
             "consequence": {
-              "BLOCK": {
-                "blocks": [
-                  {
-                    "EXPRESSION": {
-                      "expression": {
-                        "IDENTIFIER": {
-                          "identifier_token": {
-                            "IDENTIFIER": {
-                              "literal": "x"
-                            }
+              "blocks": [
+                {
+                  "EXPRESSION": {
+                    "expression": {
+                      "IDENTIFIER": {
+                        "identifier_token": {
+                          "IDENTIFIER": {
+                            "literal": "x"
                           }
                         }
                       }
                     }
                   }
-                ]
-              }
+                }
+              ]
             },
             "alternative": {
-              "BLOCK": {
-                "blocks": [
-                  {
-                    "EXPRESSION": {
-                      "expression": {
-                        "IDENTIFIER": {
-                          "identifier_token": {
-                            "IDENTIFIER": {
-                              "literal": "y"
-                            }
+              "blocks": [
+                {
+                  "EXPRESSION": {
+                    "expression": {
+                      "IDENTIFIER": {
+                        "identifier_token": {
+                          "IDENTIFIER": {
+                            "literal": "y"
                           }
                         }
                       }
                     }
                   }
-                ]
-              }
+                }
+              ]
             }
           }
         }
diff --git a/src/syntax_analysis/expressions/utilities/mod.rs b/src/syntax_analysis/expressions/utilities/mod.rs
@@ -42,9 +42,5 @@ pub fn parse_block(
         None
     );
 
-    (
-        iterator,
-        syntax_parsing_errors,
-        Some(Block::BLOCK { blocks }),
-    )
+    (iterator, syntax_parsing_errors, Some(Block { blocks }))
 }

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize};`
`3`	`3`	`use crate::lexical_analysis::token::Token;`
`4`	`4`
`5`	`5`	`#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]`
`6`		`-pub enum Block {`
`7`		`- BLOCK { blocks: Vec<SyntaxTreeNode> },`
	`6`	`+pub struct Block {`
	`7`	`+ pub blocks: Vec<SyntaxTreeNode>,`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]`
Original file line number	Diff line number	Diff line change
`@@ -29,37 +29,35 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana`
`29`	`29`	`}`
`30`	`30`	`],`
`31`	`31`	`"block": {`
`32`		`- "BLOCK": {`
`33`		`- "blocks": [`
`34`		`- {`
`35`		`- "EXPRESSION": {`
`36`		`- "expression": {`
`37`		`- "INFIX": {`
`38`		`- "left_hand": {`
`39`		`- "IDENTIFIER": {`
`40`		`- "identifier_token": {`
`41`		`- "IDENTIFIER": {`
`42`		`- "literal": "x"`
`43`		`- }`
	`32`	`+ "blocks": [`
	`33`	`+ {`
	`34`	`+ "EXPRESSION": {`
	`35`	`+ "expression": {`
	`36`	`+ "INFIX": {`
	`37`	`+ "left_hand": {`
	`38`	`+ "IDENTIFIER": {`
	`39`	`+ "identifier_token": {`
	`40`	`+ "IDENTIFIER": {`
	`41`	`+ "literal": "x"`
`44`	`42`	`}`
`45`	`43`	`}`
`46`		`- },`
`47`		`- "operator_token": "PLUS",`
`48`		`- "right_hand": {`
`49`		`- "IDENTIFIER": {`
`50`		`- "identifier_token": {`
`51`		`- "IDENTIFIER": {`
`52`		`- "literal": "y"`
`53`		`- }`
	`44`	`+ }`
	`45`	`+ },`
	`46`	`+ "operator_token": "PLUS",`
	`47`	`+ "right_hand": {`
	`48`	`+ "IDENTIFIER": {`
	`49`	`+ "identifier_token": {`
	`50`	`+ "IDENTIFIER": {`
	`51`	`+ "literal": "y"`
`54`	`52`	`}`
`55`	`53`	`}`
`56`	`54`	`}`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`	`}`
`61`		`- ]`
`62`		`- }`
	`59`	`+ }`
	`60`	`+ ]`
`63`	`61`	`}`
`64`	`62`	`}`
`65`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana`
`10`	`10`	`"FUNCTION": {`
`11`	`11`	`"parameters": [],`
`12`	`12`	`"block": {`
`13`		`- "BLOCK": {`
`14`		`- "blocks": []`
`15`		`- }`
	`13`	`+ "blocks": []`
`16`	`14`	`}`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`"block": {`
`23`		`- "BLOCK": {`
`24`		`- "blocks": []`
`25`		`- }`
	`23`	`+ "blocks": []`
`26`	`24`	`}`
`27`	`25`	`}`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,23 +32,21 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana`
`32`	`32`	`}`
`33`	`33`	`},`
`34`	`34`	`"consequence": {`
`35`		`- "BLOCK": {`
`36`		`- "blocks": [`
`37`		`- {`
`38`		`- "EXPRESSION": {`
`39`		`- "expression": {`
`40`		`- "IDENTIFIER": {`
`41`		`- "identifier_token": {`
`42`		`- "IDENTIFIER": {`
`43`		`- "literal": "x"`
`44`		`- }`
	`35`	`+ "blocks": [`
	`36`	`+ {`
	`37`	`+ "EXPRESSION": {`
	`38`	`+ "expression": {`
	`39`	`+ "IDENTIFIER": {`
	`40`	`+ "identifier_token": {`
	`41`	`+ "IDENTIFIER": {`
	`42`	`+ "literal": "x"`
`45`	`43`	`}`
`46`	`44`	`}`
`47`	`45`	`}`
`48`	`46`	`}`
`49`	`47`	`}`
`50`		`- ]`
`51`		`- }`
	`48`	`+ }`
	`49`	`+ ]`
`52`	`50`	`},`
`53`	`51`	`"alternative": null`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,42 +32,38 @@ expression: "crate::syntax_analysis::get_abstract_syntax_tree(crate::lexical_ana`
`32`	`32`	`}`
`33`	`33`	`},`
`34`	`34`	`"consequence": {`
`35`		`- "BLOCK": {`
`36`		`- "blocks": [`
`37`		`- {`
`38`		`- "EXPRESSION": {`
`39`		`- "expression": {`
`40`		`- "IDENTIFIER": {`
`41`		`- "identifier_token": {`
`42`		`- "IDENTIFIER": {`
`43`		`- "literal": "x"`
`44`		`- }`
	`35`	`+ "blocks": [`
	`36`	`+ {`
	`37`	`+ "EXPRESSION": {`
	`38`	`+ "expression": {`
	`39`	`+ "IDENTIFIER": {`
	`40`	`+ "identifier_token": {`
	`41`	`+ "IDENTIFIER": {`
	`42`	`+ "literal": "x"`
`45`	`43`	`}`
`46`	`44`	`}`
`47`	`45`	`}`
`48`	`46`	`}`
`49`	`47`	`}`
`50`		`- ]`
`51`		`- }`
	`48`	`+ }`
	`49`	`+ ]`
`52`	`50`	`},`
`53`	`51`	`"alternative": {`
`54`		`- "BLOCK": {`
`55`		`- "blocks": [`
`56`		`- {`
`57`		`- "EXPRESSION": {`
`58`		`- "expression": {`
`59`		`- "IDENTIFIER": {`
`60`		`- "identifier_token": {`
`61`		`- "IDENTIFIER": {`
`62`		`- "literal": "y"`
`63`		`- }`
	`52`	`+ "blocks": [`
	`53`	`+ {`
	`54`	`+ "EXPRESSION": {`
	`55`	`+ "expression": {`
	`56`	`+ "IDENTIFIER": {`
	`57`	`+ "identifier_token": {`
	`58`	`+ "IDENTIFIER": {`
	`59`	`+ "literal": "y"`
`64`	`60`	`}`
`65`	`61`	`}`
`66`	`62`	`}`
`67`	`63`	`}`
`68`	`64`	`}`
`69`		`- ]`
`70`		`- }`
	`65`	`+ }`
	`66`	`+ ]`
`71`	`67`	`}`
`72`	`68`	`}`
`73`	`69`	`}`