explicit return for now

crates/concrete_ast/src/constants.rs

@@ -1,6 +1,7 @@
 use crate::{
     common::{DocString, Ident},
-    types::TypeSpec, expressions::Expression,
+    expressions::Expression,
+    types::TypeSpec,
 };
 
 #[derive(Clone, Debug, PartialEq)]

crates/concrete_ast/src/expressions.rs

@@ -8,7 +8,7 @@ pub enum Expression {
 }
 
 pub struct BlockExpr {
-    pub statements: Vec<Statement>
+    pub statements: Vec<Statement>,
 }
 
 #[derive(Clone, Debug, PartialEq)]

crates/concrete_ast/src/lib.rs

@@ -1,10 +1,10 @@
 pub mod common;
 pub mod constants;
-pub mod operations;
+pub mod expressions;
 pub mod functions;
 pub mod imports;
 pub mod modules;
+pub mod operations;
 pub mod statements;
 pub mod structs;
 pub mod types;
-pub mod expressions;

crates/concrete_ast/src/statements.rs

@@ -1,7 +1,8 @@
 use crate::{
     common::Ident,
+    expressions::{Expression, MatchExpr},
     operations::{Operation, PathOp},
-    types::TypeSpec, expressions::{Expression, MatchExpr},
+    types::TypeSpec,
 };
 
 #[derive(Clone, Debug, PartialEq)]

crates/concrete_parser/src/grammar.lalrpop

@@ -315,12 +315,12 @@ pub(crate) FnCallOp: ast::operations::FnCallOp = {
 // -- Statements
 
 pub(crate) Statement: ast::statements::Statement = {
-  //<MatchExpr> => ast::statements::Statement::Match(<>),
+  <MatchExpr> ";" => ast::statements::Statement::Match(<>),
   <ReturnStmt> => ast::statements::Statement::Return(<>),
 }
 
 pub(crate) ReturnStmt: ast::statements::ReturnStmt = {
-  "return"? <value:Expression> => ast::statements::ReturnStmt {
+  "return" <value:Expression> => ast::statements::ReturnStmt {
     value,
   },
 }

crates/concrete_parser/src/lib.rs

@@ -38,8 +38,8 @@ mod ModuleName {
         let source = r##"mod FactorialModule {
     pub fn factorial(x: u64) -> u64  {
         return match x {
-            0 -> 1,
-            n -> n * factorial(n-1),
+            0 -> return 1,
+            n -> return n * factorial(n-1),
         };
     }
 }"##;