Merge pull request #113 from lambdaclass/array-parsing

Array parsing
lambdaclass · Apr 25, 2024 · 9b50130 · 9b50130
2 parents 383c46e + 2029ae1
commit 9b50130
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/crates/concrete_ast/src/expressions.rs b/crates/concrete_ast/src/expressions.rs
@@ -15,6 +15,7 @@ pub enum Expression {
     UnaryOp(UnaryOp, Box<Self>),
     BinaryOp(Box<Self>, BinaryOp, Box<Self>),
     StructInit(StructInitExpr),
+    ArrayInit(ArrayInitExpr),
     Deref(Box<Self>, Span),
     AsRef(Box<Self>, bool, Span),
     Cast(Box<Self>, TypeSpec, Span),
@@ -43,6 +44,12 @@ pub struct StructInitField {
     pub span: Span,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ArrayInitExpr {
+    pub values: Vec<Expression>,
+    pub span: Span,
+}
+
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum UnaryOp {
     ArithNeg,

diff --git a/crates/concrete_ir/src/lowering.rs b/crates/concrete_ir/src/lowering.rs
@@ -739,6 +739,7 @@ fn find_expression_type(builder: &mut FnBodyBuilder, info: &Expression) -> Optio
             })
         }
         Expression::Cast(_, _, _) => todo!(),
+        Expression::ArrayInit(_) => todo!(),
     }
 }
 
@@ -913,6 +914,7 @@ fn lower_expression(
 
             (rvalue, new_ty, *span)
         }
+        Expression::ArrayInit(_) => todo!(),
     })
 }
 

diff --git a/crates/concrete_parser/src/grammar.lalrpop b/crates/concrete_parser/src/grammar.lalrpop
@@ -347,6 +347,14 @@ pub(crate) StructInitExpr: ast::expressions::StructInitExpr = {
   }
 }
 
+
+pub(crate) ArrayInitExpr: ast::expressions::ArrayInitExpr = {
+  <lo:@L> "[" <values:Comma<Expression>> "]" <hi:@R> => ast::expressions::ArrayInitExpr {
+    values: values.into_iter().collect(),
+    span: Span::new(lo, hi),
+  }
+}
+
 // Expressions
 
 pub(crate) Term: ast::expressions::Expression = {
@@ -391,6 +399,7 @@ pub(crate) Expression: ast::expressions::Expression = {
   #[precedence(level="5")] #[assoc(side="left")]
   <lo:@L> <a:Expression> "as" <b: TypeSpec> <hi:@R> => ast::expressions::Expression::Cast(Box::new(a), b, Span::new(lo, hi)),
   "(" <StructInitExpr> ")" => ast::expressions::Expression::StructInit(<>),
+  <ArrayInitExpr> => ast::expressions::Expression::ArrayInit(<>),
 }
 
 pub BinaryFirstLvlOp: ast::expressions::BinaryOp = {

diff --git a/crates/concrete_parser/src/lib.rs b/crates/concrete_parser/src/lib.rs
@@ -219,6 +219,34 @@ mod ModuleName {
 
         return result;
     }
+}"##;
+        let lexer = Lexer::new(source);
+        let parser = grammar::ProgramParser::new();
+        parser.parse(lexer).unwrap();
+    }
+
+    #[test]
+    fn parse_array() {
+        let source = r##"mod MyMod {
+    fn hello() {
+        let mut arr: [u32; 3] = [1, 2, 3];
+
+        return arr[1];
+    }
+}"##;
+        let lexer = Lexer::new(source);
+        let parser = grammar::ProgramParser::new();
+        parser.parse(lexer).unwrap();
+    }
+
+    #[test]
+    fn parse_nested_array() {
+        let source = r##"mod MyMod {
+    fn hello() {
+        let mut arr: [[u32; 2]; 2] = [[1, 2], [3, 4]];
+
+        return arr[1][0];
+    }
 }"##;
         let lexer = Lexer::new(source);
         let parser = grammar::ProgramParser::new();