Merged new grammar. keyword with removed from struct instanciation

ast/src/parsed/display.rs

@@ -720,7 +720,7 @@ impl<E: Display> Display for StructExpression<E> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         write!(
             f,
-            "{} with {}",
+            "{}{}",
             self.name,
             if self.fields.is_empty() {
                 "".to_string()

parser/src/powdr.lalrpop

@@ -626,7 +626,6 @@ TermCommon<StructOption>: Box<Expression> = {
     MatchExpression,
     IfExpression,
     BlockExpression,
-    StructExpression,
     <start:@L> "[" <items:ExpressionList> "]" <end:@R> => ctx.to_expr_with_source_ref(ArrayLiteral{items}, start, end),
     <start:@L> "(" <head:Expression> "," <tail:ExpressionList> ")" <end:@R> => { let mut list = vec![head]; list.extend(tail); Box::new(Expression::Tuple(ctx.source_ref(start, end), list)) },
     <start:@L> "(" ")" <end:@R> => Box::new(Expression::Tuple(ctx.source_ref(start, end), vec![])),
@@ -674,7 +673,7 @@ IfExpression: Box<Expression> = {
 }
 
 StructExpression: Box<Expression> = {
-    <start:@L> <name:Identifier> "with" "{" <fields:NamedExpressions> "}" <end:@R> => ctx.to_expr_with_source_ref(StructExpression{name, fields}, start, end),
+    <start:@L> <name:Identifier> "{" <fields:NamedExpressions> "}" <end:@R> => ctx.to_expr_with_source_ref(StructExpression{name, fields}, start, end),
 }
 
 BlockExpression: Box<Expression> = {
@@ -686,12 +685,6 @@ StatementInsideBlock: StatementInsideBlock = {
     <Expression> ";" => StatementInsideBlock::Expression(<>),
 }
 
-
-// This rules are placeholder to test the parser. Structs are not implemented yet.
-StructExpression: Box<Expression> = {
-    <start:@L> <name:Identifier> "{" <fields:NamedExpressions> "}" <end:@R> => Box::new(Expression::Tuple(ctx.source_ref(start, end), vec![])),
-}
-
 // ---------------------------- Pattern -----------------------------
 
 Pattern: Pattern = {

pil-analyzer/tests/parse_display.rs

@@ -878,7 +878,7 @@ fn simple_struct() {
         x: int,
         y: int,
     }
-    let f: int -> Point = (|i| Point with { x: 0, y: i });
+    let f: int -> Point = (|i| Point{ x: 0, y: i });
     let x: Point = f(0);
 ";
     let formatted = analyze_string::<GoldilocksField>(input).to_string();
@@ -892,9 +892,9 @@ fn struct_constr_var_typed() {
         y: int,
     }
     let v: int -> X = (|i| match i {
-        1 => X with { x: 1, y: 0 },
-        2 => X with { x: 2, y: 2 },
-        _ => X with { x: 0, y: 1 },
+        1 => X{ x: 1, y: 0 },
+        2 => X{ x: 2, y: 2 },
+        _ => X{ x: 0, y: 1 },
     });
     let x: X = v(1);
 ";

pil-analyzer/tests/types.rs

@@ -565,7 +565,7 @@ fn empty_conditional() {
 fn simple_struct() {
     let input = "
     struct Dot { x: int, y: int }
-    let f: int -> Dot = |i| Dot with {x: 0, y: i};
+    let f: int -> Dot = |i| Dot{x: 0, y: i};
 
     let x: Dot = f(0);
     ";
@@ -591,9 +591,9 @@ fn struct_constr_var_typed() {
     let input = "
     struct X {x: int, y: int}
     let v: int -> X = |i| match i {
-        1 => X with {x: 1, y: 0},
-        2 => X with {x: 2, y: 2},
-        _ => X with {x: 0, y: 1},
+        1 => X{x: 1, y: 0},
+        2 => X{x: 2, y: 2},
+        _ => X{x: 0, y: 1},
     };
 
     let x: X = v(1);