Improved match statements

mist-test/src/logger.mist

@@ -13,18 +13,13 @@ pub enum LogLevel {
 
 impl fmt::Display for LogLevel {
     fmt::Result fmt(self*, Formatter<'_> mut* f) {
-        match (self) {
+        return match (self) {
-            LogLevel::Info => {
+            LogLevel::Info => write!(f, "[INFO]");
-                return write!(f, "[INFO]");
-            }
 
-            LogLevel::Warning => {
+            LogLevel::Warning => write!(f, "[WARN]");
-                return write!(f, "[WARN]");
+
-            }
+            LogLevel::Error => write!(f, "[ERROR]");
             
-            LogLevel::Error => {
-                return write!(f, "[ERROR]");
-            }
         }
     }
 }

parser/src/ast/statement.rs

@@ -30,7 +30,7 @@ pub enum Statement {
         iterator: Expression,
         body: Box<Statement>,
     },
-    Match(Expression, Vec<(Vec<Pattern>, Block)>),
+    Match(Expression, Vec<(Vec<Pattern>, Expression)>),
 
     Return(Option<Expression>),
     Break,

parser/src/grammar.pest

@@ -419,7 +419,7 @@ for_stmt = {
 pattern_list = { pattern ~ ("|" ~ pattern)* }
 
 match_item = {
-    pattern_list ~ "=>" ~ block
+    pattern_list ~ "=>" ~ statement
 }
 
 match_stmt = {

parser/src/parser/common/statement.rs

@@ -95,7 +95,7 @@ impl<'a> TryFrom<pest::iterators::Pair<'a, Rule>> for Statement {
                         let mut match_inner = match_itms.into_inner();
                         Ok((
                             collect_recovered(match_inner.next().unwrap().into_inner()).get()?,
-                            Block::try_from(match_inner.next().unwrap()).get()?,
+                            Expression::try_from(match_inner.next().unwrap()).get()?,
                         ))
                     })
                     .collect::<AstResult<'a, Vec<_>>>(),