diff --git a/crates/fuse-ast/src/ast.rs b/crates/fuse-ast/src/ast.rs index 562d81d..9a2580f 100644 --- a/crates/fuse-ast/src/ast.rs +++ b/crates/fuse-ast/src/ast.rs @@ -100,9 +100,7 @@ pub struct Atom(pub Rc); #[serializable] #[derive(Debug, PartialEq)] pub enum Expression { - NumberLiteral(Box), - StringLiteral(Box), - BooleanLiteral(Box), + Literal(Box), Identifier(Box), Function(Box), If(Box), @@ -116,6 +114,14 @@ pub enum Expression { StructConstructionExpression(Box), } +#[serializable] +#[derive(Debug, PartialEq)] +pub enum Literal { + Number(NumberLiteral), + String(StringLiteral), + Boolean(BooleanLiteral), +} + #[serializable] #[derive(Debug, PartialEq)] pub struct BooleanLiteral { diff --git a/crates/fuse-ast/src/ast_factory.rs b/crates/fuse-ast/src/ast_factory.rs index 3edcf25..55a9644 100644 --- a/crates/fuse-ast/src/ast_factory.rs +++ b/crates/fuse-ast/src/ast_factory.rs @@ -112,16 +112,16 @@ impl AstFactory { } } - pub fn boolean_expression(&self, literal: BooleanLiteral) -> Expression { - Expression::BooleanLiteral(Box::from(literal)) + pub fn boolean_literal_expression(&self, literal: BooleanLiteral) -> Expression { + Expression::Literal(Box::from(Literal::Boolean(literal))) } - pub fn number_expression(&self, literal: NumberLiteral) -> Expression { - Expression::NumberLiteral(Box::from(literal)) + pub fn number_literal_expression(&self, literal: NumberLiteral) -> Expression { + Expression::Literal(Box::from(Literal::Number(literal))) } - pub fn string_expression(&self, literal: StringLiteral) -> Expression { - Expression::StringLiteral(Box::from(literal)) + pub fn string_literal_expression(&self, literal: StringLiteral) -> Expression { + Expression::Literal(Box::from(Literal::String(literal))) } pub fn identifier_expression(&self, ident: Identifier) -> Expression { diff --git a/crates/fuse-parser/src/parsers/expressions.rs b/crates/fuse-parser/src/parsers/expressions.rs index 0433c15..5345716 100644 --- a/crates/fuse-parser/src/parsers/expressions.rs +++ b/crates/fuse-parser/src/parsers/expressions.rs @@ -24,24 +24,24 @@ impl<'a> Parser<'a> { let expr = match self.cur_kind() { True => { let token = self.consume(); - Ok(self.ast.boolean_expression(BooleanLiteral { + Ok(self.ast.boolean_literal_expression(BooleanLiteral { span: token.span(), value: true, })) } False => { let token = self.consume(); - Ok(self.ast.boolean_expression(BooleanLiteral { + Ok(self.ast.boolean_literal_expression(BooleanLiteral { span: token.span(), value: false, })) } NumberLiteral => self .parse_number_literal() - .map(|expr| self.ast.number_expression(expr)), + .map(|expr| self.ast.number_literal_expression(expr)), StringLiteral | InterpolatedStringHead => self .parse_string_literal() - .map(|expr| self.ast.string_expression(expr)), + .map(|expr| self.ast.string_literal_expression(expr)), Identifier => self .parse_identifier() .map(|id| self.ast.identifier_expression(id)), diff --git a/crates/fuse-parser/tests/cases/fail/variable-declaration-01/ast.snap b/crates/fuse-parser/tests/cases/fail/variable-declaration-01/ast.snap index 446d9cd..1bf6564 100644 --- a/crates/fuse-parser/tests/cases/fail/variable-declaration-01/ast.snap +++ b/crates/fuse-parser/tests/cases/fail/variable-declaration-01/ast.snap @@ -29,7 +29,7 @@ Some(Chunk( type_annotation: None, optional: false, ), - expression: Some(NumberLiteral(NumberLiteral( + expression: Some(Literal(Number(NumberLiteral( span: Span( start: 13, end: 16, @@ -37,7 +37,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - ))), + )))), )), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/array-initializer-01/ast.snap b/crates/fuse-parser/tests/cases/pass/array-initializer-01/ast.snap index cf67f44..a5e06a7 100644 --- a/crates/fuse-parser/tests/cases/pass/array-initializer-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/array-initializer-01/ast.snap @@ -17,7 +17,7 @@ Some(Chunk( end: 15, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 1, end: 2, @@ -25,8 +25,8 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 4, end: 5, @@ -34,8 +34,8 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 7, end: 8, @@ -43,8 +43,8 @@ Some(Chunk( raw: Atom("3"), value: 3.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 10, end: 11, @@ -52,8 +52,8 @@ Some(Chunk( raw: Atom("4"), value: 4.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 13, end: 14, @@ -61,7 +61,7 @@ Some(Chunk( raw: Atom("5"), value: 5.0, kind: Decimal, - ))), + )))), ], ))), ], diff --git a/crates/fuse-parser/tests/cases/pass/array-initializer-02/ast.snap b/crates/fuse-parser/tests/cases/pass/array-initializer-02/ast.snap index ab21ed8..f8545ef 100644 --- a/crates/fuse-parser/tests/cases/pass/array-initializer-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/array-initializer-02/ast.snap @@ -17,7 +17,7 @@ Some(Chunk( end: 37, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 1, end: 2, @@ -25,8 +25,8 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 4, end: 5, @@ -34,8 +34,8 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 7, end: 8, @@ -43,8 +43,8 @@ Some(Chunk( raw: Atom("3"), value: 3.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 10, end: 11, @@ -52,7 +52,7 @@ Some(Chunk( raw: Atom("4"), value: 4.0, kind: Decimal, - ))), + )))), Spread(SpreadArgument( span: Span( start: 13, @@ -64,7 +64,7 @@ Some(Chunk( end: 36, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 17, end: 18, @@ -72,8 +72,8 @@ Some(Chunk( raw: Atom("5"), value: 5.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 20, end: 21, @@ -81,8 +81,8 @@ Some(Chunk( raw: Atom("6"), value: 6.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 23, end: 24, @@ -90,7 +90,7 @@ Some(Chunk( raw: Atom("7"), value: 7.0, kind: Decimal, - ))), + )))), Spread(SpreadArgument( span: Span( start: 26, @@ -102,7 +102,7 @@ Some(Chunk( end: 35, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 30, end: 31, @@ -110,8 +110,8 @@ Some(Chunk( raw: Atom("8"), value: 8.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 33, end: 34, @@ -119,7 +119,7 @@ Some(Chunk( raw: Atom("9"), value: 9.0, kind: Decimal, - ))), + )))), ], )), )), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-04/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-04/ast.snap index a130e21..2e7ce34 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-04/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-04/ast.snap @@ -33,7 +33,7 @@ Some(Chunk( start: 6, end: 7, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 4, end: 5, @@ -41,13 +41,13 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - )), + ))), rhs: BinaryOperator(BinaryOperator( kind: Multiply(Span( start: 10, end: 11, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 8, end: 9, @@ -55,8 +55,8 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 12, end: 13, @@ -64,7 +64,7 @@ Some(Chunk( raw: Atom("3"), value: 3.0, kind: Decimal, - )), + ))), )), )), rhs: BinaryOperator(BinaryOperator( @@ -72,7 +72,7 @@ Some(Chunk( start: 18, end: 19, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 16, end: 17, @@ -80,8 +80,8 @@ Some(Chunk( raw: Atom("4"), value: 4.0, kind: Decimal, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 20, end: 21, @@ -89,7 +89,7 @@ Some(Chunk( raw: Atom("5"), value: 5.0, kind: Decimal, - )), + ))), )), )), ))), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-05/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-05/ast.snap index a763744..b50a076 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-05/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-05/ast.snap @@ -33,7 +33,7 @@ Some(Chunk( start: 6, end: 7, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 4, end: 5, @@ -41,8 +41,8 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 8, end: 9, @@ -50,14 +50,14 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - )), + ))), )), rhs: BinaryOperator(BinaryOperator( kind: Plus(Span( start: 14, end: 15, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 12, end: 13, @@ -65,13 +65,13 @@ Some(Chunk( raw: Atom("3"), value: 3.0, kind: Decimal, - )), + ))), rhs: BinaryOperator(BinaryOperator( kind: FloorDivision(Span( start: 18, end: 20, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 16, end: 17, @@ -79,8 +79,8 @@ Some(Chunk( raw: Atom("4"), value: 4.0, kind: Decimal, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 21, end: 22, @@ -88,7 +88,7 @@ Some(Chunk( raw: Atom("5"), value: 5.0, kind: Decimal, - )), + ))), )), )), )), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-07/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-07/ast.snap index b3db450..f51fc18 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-07/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-07/ast.snap @@ -41,7 +41,7 @@ Some(Chunk( name: Atom("x"), )), )), - rhs: NumberLiteral(NumberLiteral( + rhs: Literal(Number(NumberLiteral( span: Span( start: 9, end: 10, @@ -49,7 +49,7 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - )), + ))), )), ))), ], diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-08/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-08/ast.snap index f2acce0..1bd5039 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-08/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-08/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 7, end: 8, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -24,8 +24,8 @@ Some(Chunk( raw: Atom("0b0101"), value: 5.0, kind: Binary, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 9, end: 15, @@ -33,7 +33,7 @@ Some(Chunk( raw: Atom("0b1010"), value: 10.0, kind: Binary, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-09/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-09/ast.snap index ce99aa3..4c9ce37 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-09/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-09/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 7, end: 8, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -24,8 +24,8 @@ Some(Chunk( raw: Atom("0b0101"), value: 5.0, kind: Binary, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 9, end: 15, @@ -33,7 +33,7 @@ Some(Chunk( raw: Atom("0b1010"), value: 10.0, kind: Binary, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-10/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-10/ast.snap index 293eaa6..8f9c8f9 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-10/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-10/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 7, end: 8, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -24,8 +24,8 @@ Some(Chunk( raw: Atom("0b0101"), value: 5.0, kind: Binary, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 9, end: 15, @@ -33,7 +33,7 @@ Some(Chunk( raw: Atom("0b1010"), value: 10.0, kind: Binary, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-11/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-11/ast.snap index 4184b2b..9ff1774 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-11/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-11/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 7, end: 9, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -24,8 +24,8 @@ Some(Chunk( raw: Atom("0b0101"), value: 5.0, kind: Binary, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 10, end: 11, @@ -33,7 +33,7 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-12/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-12/ast.snap index 5e00763..67a3b53 100644 --- a/crates/fuse-parser/tests/cases/pass/binary-operator-12/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/binary-operator-12/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 7, end: 9, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -24,8 +24,8 @@ Some(Chunk( raw: Atom("0b0101"), value: 5.0, kind: Binary, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 10, end: 11, @@ -33,7 +33,7 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/boolean-literal-01/ast.snap b/crates/fuse-parser/tests/cases/pass/boolean-literal-01/ast.snap index be23cd8..d76e460 100644 --- a/crates/fuse-parser/tests/cases/pass/boolean-literal-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/boolean-literal-01/ast.snap @@ -11,13 +11,13 @@ Some(Chunk( ), body: Block( statements: [ - Expression(BooleanLiteral(BooleanLiteral( + Expression(Literal(Boolean(BooleanLiteral( span: Span( start: 0, end: 4, ), value: true, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/boolean-literal-02/ast.snap b/crates/fuse-parser/tests/cases/pass/boolean-literal-02/ast.snap index 5c29b46..b3ebc44 100644 --- a/crates/fuse-parser/tests/cases/pass/boolean-literal-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/boolean-literal-02/ast.snap @@ -11,13 +11,13 @@ Some(Chunk( ), body: Block( statements: [ - Expression(BooleanLiteral(BooleanLiteral( + Expression(Literal(Boolean(BooleanLiteral( span: Span( start: 0, end: 5, ), value: false, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/enum-declaration-02/ast.snap b/crates/fuse-parser/tests/cases/pass/enum-declaration-02/ast.snap index e555339..447d193 100644 --- a/crates/fuse-parser/tests/cases/pass/enum-declaration-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/enum-declaration-02/ast.snap @@ -32,7 +32,7 @@ Some(Chunk( ), name: Atom("Var1"), ), - value: Some(StringLiteral(StringLiteral( + value: Some(Literal(String(StringLiteral( span: Span( start: 19, end: 26, @@ -43,7 +43,7 @@ Some(Chunk( end: 26, ))), ], - ))), + )))), ), EnumVariant( identifier: Identifier( @@ -53,7 +53,7 @@ Some(Chunk( ), name: Atom("Var2"), ), - value: Some(StringLiteral(StringLiteral( + value: Some(Literal(String(StringLiteral( span: Span( start: 35, end: 42, @@ -64,7 +64,7 @@ Some(Chunk( end: 42, ))), ], - ))), + )))), ), ], )), diff --git a/crates/fuse-parser/tests/cases/pass/function-expression-02/ast.snap b/crates/fuse-parser/tests/cases/pass/function-expression-02/ast.snap index f2d57b6..089dba6 100644 --- a/crates/fuse-parser/tests/cases/pass/function-expression-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/function-expression-02/ast.snap @@ -34,7 +34,7 @@ Some(Chunk( ), body: Block(Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 6, end: 19, @@ -45,7 +45,7 @@ Some(Chunk( end: 19, ))), ], - ))), + )))), ], )), ))), diff --git a/crates/fuse-parser/tests/cases/pass/if-expression-01/ast.snap b/crates/fuse-parser/tests/cases/pass/if-expression-01/ast.snap index 817db7d..3ed6977 100644 --- a/crates/fuse-parser/tests/cases/pass/if-expression-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/if-expression-01/ast.snap @@ -25,13 +25,13 @@ Some(Chunk( )), body: Block( statements: [ - Expression(BooleanLiteral(BooleanLiteral( + Expression(Literal(Boolean(BooleanLiteral( span: Span( start: 13, end: 17, ), value: true, - ))), + )))), ], ), else: None, diff --git a/crates/fuse-parser/tests/cases/pass/if-expression-02/ast.snap b/crates/fuse-parser/tests/cases/pass/if-expression-02/ast.snap index c8f2e8d..89d3e92 100644 --- a/crates/fuse-parser/tests/cases/pass/if-expression-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/if-expression-02/ast.snap @@ -25,24 +25,24 @@ Some(Chunk( )), body: Block( statements: [ - Expression(BooleanLiteral(BooleanLiteral( + Expression(Literal(Boolean(BooleanLiteral( span: Span( start: 14, end: 18, ), value: true, - ))), + )))), ], ), else: Some(Block(Block( statements: [ - Expression(BooleanLiteral(BooleanLiteral( + Expression(Literal(Boolean(BooleanLiteral( span: Span( start: 25, end: 30, ), value: false, - ))), + )))), ], ))), ))), diff --git a/crates/fuse-parser/tests/cases/pass/if-expression-03/ast.snap b/crates/fuse-parser/tests/cases/pass/if-expression-03/ast.snap index d528cc9..be4b4cc 100644 --- a/crates/fuse-parser/tests/cases/pass/if-expression-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/if-expression-03/ast.snap @@ -24,7 +24,7 @@ Some(Chunk( )), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 15, end: 25, @@ -35,7 +35,7 @@ Some(Chunk( end: 25, ))), ], - ))), + )))), ], ), else: Some(If(If( @@ -52,7 +52,7 @@ Some(Chunk( )), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 45, end: 59, @@ -63,12 +63,12 @@ Some(Chunk( end: 59, ))), ], - ))), + )))), ], ), else: Some(Block(Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 66, end: 78, @@ -79,7 +79,7 @@ Some(Chunk( end: 78, ))), ], - ))), + )))), ], ))), ))), diff --git a/crates/fuse-parser/tests/cases/pass/if-expression-04/ast.snap b/crates/fuse-parser/tests/cases/pass/if-expression-04/ast.snap index 82c7a23..47c1db6 100644 --- a/crates/fuse-parser/tests/cases/pass/if-expression-04/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/if-expression-04/ast.snap @@ -50,7 +50,7 @@ Some(Chunk( )), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 23, end: 26, @@ -58,7 +58,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - ))), + )))), ], ), else: Some(If(If( @@ -101,7 +101,7 @@ Some(Chunk( )), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 54, end: 57, @@ -109,12 +109,12 @@ Some(Chunk( raw: Atom("321"), value: 321.0, kind: Decimal, - ))), + )))), ], ), else: Some(Block(Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 65, end: 66, @@ -122,7 +122,7 @@ Some(Chunk( raw: Atom("0"), value: 0.0, kind: Decimal, - ))), + )))), ], ))), ))), diff --git a/crates/fuse-parser/tests/cases/pass/number-literal-01/ast.snap b/crates/fuse-parser/tests/cases/pass/number-literal-01/ast.snap index b4460ea..5f50761 100644 --- a/crates/fuse-parser/tests/cases/pass/number-literal-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/number-literal-01/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 0, end: 3, @@ -19,7 +19,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/number-literal-02/ast.snap b/crates/fuse-parser/tests/cases/pass/number-literal-02/ast.snap index a6ed3fd..779cde2 100644 --- a/crates/fuse-parser/tests/cases/pass/number-literal-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/number-literal-02/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 0, end: 4, @@ -19,7 +19,7 @@ Some(Chunk( raw: Atom("1.23"), value: 1.23, kind: Float, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/number-literal-03/ast.snap b/crates/fuse-parser/tests/cases/pass/number-literal-03/ast.snap index f87d7be..9d1050e 100644 --- a/crates/fuse-parser/tests/cases/pass/number-literal-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/number-literal-03/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 0, end: 5, @@ -19,7 +19,7 @@ Some(Chunk( raw: Atom("1.2e3"), value: 1200.0, kind: Float, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/number-literal-04/ast.snap b/crates/fuse-parser/tests/cases/pass/number-literal-04/ast.snap index b1ac03f..27c17c1 100644 --- a/crates/fuse-parser/tests/cases/pass/number-literal-04/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/number-literal-04/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -19,7 +19,7 @@ Some(Chunk( raw: Atom("1.2e+3"), value: 1200.0, kind: Float, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/number-literal-05/ast.snap b/crates/fuse-parser/tests/cases/pass/number-literal-05/ast.snap index b5be027..3d9224a 100644 --- a/crates/fuse-parser/tests/cases/pass/number-literal-05/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/number-literal-05/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 0, end: 6, @@ -19,7 +19,7 @@ Some(Chunk( raw: Atom("1.2e-3"), value: 0.0012, kind: Float, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/number-literal-06/ast.snap b/crates/fuse-parser/tests/cases/pass/number-literal-06/ast.snap index 031cde0..8a4816a 100644 --- a/crates/fuse-parser/tests/cases/pass/number-literal-06/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/number-literal-06/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 0, end: 7, @@ -19,7 +19,7 @@ Some(Chunk( raw: Atom("123_456"), value: 123456.0, kind: Decimal, - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/parenthesized-expression-01/ast.snap b/crates/fuse-parser/tests/cases/pass/parenthesized-expression-01/ast.snap index 8eeae5f..c0e0878 100644 --- a/crates/fuse-parser/tests/cases/pass/parenthesized-expression-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/parenthesized-expression-01/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 0, end: 9, ), - expression: StringLiteral(StringLiteral( + expression: Literal(String(StringLiteral( span: Span( start: 1, end: 8, @@ -27,7 +27,7 @@ Some(Chunk( end: 8, ))), ], - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/parenthesized-expression-03/ast.snap b/crates/fuse-parser/tests/cases/pass/parenthesized-expression-03/ast.snap index 9020163..dd8b37c 100644 --- a/crates/fuse-parser/tests/cases/pass/parenthesized-expression-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/parenthesized-expression-03/ast.snap @@ -26,7 +26,7 @@ Some(Chunk( start: 5, end: 8, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 1, end: 4, @@ -34,8 +34,8 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - )), - rhs: NumberLiteral(NumberLiteral( + ))), + rhs: Literal(Number(NumberLiteral( span: Span( start: 9, end: 12, @@ -43,14 +43,14 @@ Some(Chunk( raw: Atom("456"), value: 456.0, kind: Decimal, - )), + ))), )), rhs: BinaryOperator(BinaryOperator( kind: GreaterThan(Span( start: 20, end: 21, )), - lhs: NumberLiteral(NumberLiteral( + lhs: Literal(Number(NumberLiteral( span: Span( start: 16, end: 19, @@ -58,7 +58,7 @@ Some(Chunk( raw: Atom("789"), value: 789.0, kind: Decimal, - )), + ))), rhs: Identifier(Identifier( span: Span( start: 22, diff --git a/crates/fuse-parser/tests/cases/pass/string-interpolation-01/ast.snap b/crates/fuse-parser/tests/cases/pass/string-interpolation-01/ast.snap index 3f3f6ba..b242fce 100644 --- a/crates/fuse-parser/tests/cases/pass/string-interpolation-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-interpolation-01/ast.snap @@ -11,14 +11,14 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 15, ), segments: [ Interpolated(InterpolatedStringSegment( - expression: NumberLiteral(NumberLiteral( + expression: Literal(Number(NumberLiteral( span: Span( start: 9, end: 12, @@ -26,11 +26,11 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - )), + ))), format: Display, )), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-interpolation-02/ast.snap b/crates/fuse-parser/tests/cases/pass/string-interpolation-02/ast.snap index 02dd045..71cc77a 100644 --- a/crates/fuse-parser/tests/cases/pass/string-interpolation-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-interpolation-02/ast.snap @@ -11,14 +11,14 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 26, ), segments: [ Interpolated(InterpolatedStringSegment( - expression: StringLiteral(StringLiteral( + expression: Literal(String(StringLiteral( span: Span( start: 10, end: 17, @@ -29,11 +29,11 @@ Some(Chunk( end: 17, ))), ], - )), + ))), format: Display, )), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-interpolation-03/ast.snap b/crates/fuse-parser/tests/cases/pass/string-interpolation-03/ast.snap index 7afbef5..37d9c66 100644 --- a/crates/fuse-parser/tests/cases/pass/string-interpolation-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-interpolation-03/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 18, @@ -28,7 +28,7 @@ Some(Chunk( format: Display, )), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-interpolation-04/ast.snap b/crates/fuse-parser/tests/cases/pass/string-interpolation-04/ast.snap index d272e74..8471886 100644 --- a/crates/fuse-parser/tests/cases/pass/string-interpolation-04/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-interpolation-04/ast.snap @@ -11,24 +11,24 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 24, ), segments: [ Interpolated(InterpolatedStringSegment( - expression: BooleanLiteral(BooleanLiteral( + expression: Literal(Boolean(BooleanLiteral( span: Span( start: 10, end: 14, ), value: true, - )), + ))), format: Display, )), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-interpolation-05/ast.snap b/crates/fuse-parser/tests/cases/pass/string-interpolation-05/ast.snap index ccdf4e5..b9fd630 100644 --- a/crates/fuse-parser/tests/cases/pass/string-interpolation-05/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-interpolation-05/ast.snap @@ -11,24 +11,24 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 25, ), segments: [ Interpolated(InterpolatedStringSegment( - expression: BooleanLiteral(BooleanLiteral( + expression: Literal(Boolean(BooleanLiteral( span: Span( start: 10, end: 15, ), value: false, - )), + ))), format: Display, )), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-literal-01/ast.snap b/crates/fuse-parser/tests/cases/pass/string-literal-01/ast.snap index 0e03318..b51fb2a 100644 --- a/crates/fuse-parser/tests/cases/pass/string-literal-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-literal-01/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 14, @@ -22,7 +22,7 @@ Some(Chunk( end: 14, ))), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-literal-02/ast.snap b/crates/fuse-parser/tests/cases/pass/string-literal-02/ast.snap index 6906266..20b10ed 100644 --- a/crates/fuse-parser/tests/cases/pass/string-literal-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-literal-02/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 14, @@ -22,7 +22,7 @@ Some(Chunk( end: 14, ))), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/string-literal-03/ast.snap b/crates/fuse-parser/tests/cases/pass/string-literal-03/ast.snap index 45cc73e..3709cc4 100644 --- a/crates/fuse-parser/tests/cases/pass/string-literal-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/string-literal-03/ast.snap @@ -11,7 +11,7 @@ Some(Chunk( ), body: Block( statements: [ - Expression(StringLiteral(StringLiteral( + Expression(Literal(String(StringLiteral( span: Span( start: 0, end: 22, @@ -19,7 +19,7 @@ Some(Chunk( segments: [ Literal(Escaped(Atom("Hello, \nWorld"))), ], - ))), + )))), ], ), )) diff --git a/crates/fuse-parser/tests/cases/pass/struct-construction-01/ast.snap b/crates/fuse-parser/tests/cases/pass/struct-construction-01/ast.snap index 5fa4634..42240cd 100644 --- a/crates/fuse-parser/tests/cases/pass/struct-construction-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/struct-construction-01/ast.snap @@ -37,7 +37,7 @@ Some(Chunk( ), name: Atom("first"), ), - value: NumberLiteral(NumberLiteral( + value: Literal(Number(NumberLiteral( span: Span( start: 18, end: 21, @@ -45,7 +45,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - )), + ))), )), KeyValueArgument(KeyValueArgument( span: Span( @@ -59,7 +59,7 @@ Some(Chunk( ), name: Atom("second"), ), - value: NumberLiteral(NumberLiteral( + value: Literal(Number(NumberLiteral( span: Span( start: 31, end: 34, @@ -67,7 +67,7 @@ Some(Chunk( raw: Atom("456"), value: 456.0, kind: Decimal, - )), + ))), )), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/struct-construction-02/ast.snap b/crates/fuse-parser/tests/cases/pass/struct-construction-02/ast.snap index 69c0e8a..1a92b30 100644 --- a/crates/fuse-parser/tests/cases/pass/struct-construction-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/struct-construction-02/ast.snap @@ -37,7 +37,7 @@ Some(Chunk( ), name: Atom("first"), ), - value: StringLiteral(StringLiteral( + value: Literal(String(StringLiteral( span: Span( start: 14, end: 21, @@ -48,7 +48,7 @@ Some(Chunk( end: 21, ))), ], - )), + ))), )), Expression(Identifier(Identifier( span: Span( diff --git a/crates/fuse-parser/tests/cases/pass/tuple-initializer-01/ast.snap b/crates/fuse-parser/tests/cases/pass/tuple-initializer-01/ast.snap index 50ed405..2ead6e8 100644 --- a/crates/fuse-parser/tests/cases/pass/tuple-initializer-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/tuple-initializer-01/ast.snap @@ -17,7 +17,7 @@ Some(Chunk( end: 15, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 1, end: 2, @@ -25,8 +25,8 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 4, end: 5, @@ -34,8 +34,8 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 7, end: 8, @@ -43,8 +43,8 @@ Some(Chunk( raw: Atom("3"), value: 3.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 10, end: 11, @@ -52,8 +52,8 @@ Some(Chunk( raw: Atom("4"), value: 4.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 13, end: 14, @@ -61,7 +61,7 @@ Some(Chunk( raw: Atom("5"), value: 5.0, kind: Decimal, - ))), + )))), ], ))), ], diff --git a/crates/fuse-parser/tests/cases/pass/tuple-initializer-02/ast.snap b/crates/fuse-parser/tests/cases/pass/tuple-initializer-02/ast.snap index e4633c1..3ab38b3 100644 --- a/crates/fuse-parser/tests/cases/pass/tuple-initializer-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/tuple-initializer-02/ast.snap @@ -17,7 +17,7 @@ Some(Chunk( end: 34, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 1, end: 2, @@ -25,8 +25,8 @@ Some(Chunk( raw: Atom("1"), value: 1.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 4, end: 5, @@ -34,8 +34,8 @@ Some(Chunk( raw: Atom("2"), value: 2.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 7, end: 8, @@ -43,7 +43,7 @@ Some(Chunk( raw: Atom("3"), value: 3.0, kind: Decimal, - ))), + )))), Spread(SpreadArgument( span: Span( start: 10, @@ -55,7 +55,7 @@ Some(Chunk( end: 33, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 14, end: 15, @@ -63,8 +63,8 @@ Some(Chunk( raw: Atom("4"), value: 4.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 17, end: 18, @@ -72,7 +72,7 @@ Some(Chunk( raw: Atom("5"), value: 5.0, kind: Decimal, - ))), + )))), Spread(SpreadArgument( span: Span( start: 20, @@ -84,7 +84,7 @@ Some(Chunk( end: 32, ), elements: [ - Expression(NumberLiteral(NumberLiteral( + Expression(Literal(Number(NumberLiteral( span: Span( start: 24, end: 25, @@ -92,8 +92,8 @@ Some(Chunk( raw: Atom("6"), value: 6.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 27, end: 28, @@ -101,8 +101,8 @@ Some(Chunk( raw: Atom("7"), value: 7.0, kind: Decimal, - ))), - Expression(NumberLiteral(NumberLiteral( + )))), + Expression(Literal(Number(NumberLiteral( span: Span( start: 30, end: 31, @@ -110,7 +110,7 @@ Some(Chunk( raw: Atom("8"), value: 8.0, kind: Decimal, - ))), + )))), ], )), )), diff --git a/crates/fuse-parser/tests/cases/pass/unary-operator-01/ast.snap b/crates/fuse-parser/tests/cases/pass/unary-operator-01/ast.snap index a98ae45..792d6b8 100644 --- a/crates/fuse-parser/tests/cases/pass/unary-operator-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/unary-operator-01/ast.snap @@ -16,13 +16,13 @@ Some(Chunk( start: 0, end: 3, )), - expression: BooleanLiteral(BooleanLiteral( + expression: Literal(Boolean(BooleanLiteral( span: Span( start: 4, end: 8, ), value: true, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/unary-operator-02/ast.snap b/crates/fuse-parser/tests/cases/pass/unary-operator-02/ast.snap index c2fb032..bf0dafd 100644 --- a/crates/fuse-parser/tests/cases/pass/unary-operator-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/unary-operator-02/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 0, end: 1, )), - expression: NumberLiteral(NumberLiteral( + expression: Literal(Number(NumberLiteral( span: Span( start: 1, end: 4, @@ -24,7 +24,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/unary-operator-03/ast.snap b/crates/fuse-parser/tests/cases/pass/unary-operator-03/ast.snap index c652319..e986e2e 100644 --- a/crates/fuse-parser/tests/cases/pass/unary-operator-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/unary-operator-03/ast.snap @@ -16,7 +16,7 @@ Some(Chunk( start: 0, end: 1, )), - expression: NumberLiteral(NumberLiteral( + expression: Literal(Number(NumberLiteral( span: Span( start: 1, end: 4, @@ -24,7 +24,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/variable-assignment-01/ast.snap b/crates/fuse-parser/tests/cases/pass/variable-assignment-01/ast.snap index 31a453f..6a038a7 100644 --- a/crates/fuse-parser/tests/cases/pass/variable-assignment-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/variable-assignment-01/ast.snap @@ -23,7 +23,7 @@ Some(Chunk( ), name: Atom("x"), )), - rhs: NumberLiteral(NumberLiteral( + rhs: Literal(Number(NumberLiteral( span: Span( start: 4, end: 7, @@ -31,7 +31,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - )), + ))), ))), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/variable-declaration-01/ast.snap b/crates/fuse-parser/tests/cases/pass/variable-declaration-01/ast.snap index 38387d8..82336d7 100644 --- a/crates/fuse-parser/tests/cases/pass/variable-declaration-01/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/variable-declaration-01/ast.snap @@ -29,7 +29,7 @@ Some(Chunk( type_annotation: None, optional: false, ), - expression: Some(NumberLiteral(NumberLiteral( + expression: Some(Literal(Number(NumberLiteral( span: Span( start: 9, end: 12, @@ -37,7 +37,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - ))), + )))), )), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/variable-declaration-02/ast.snap b/crates/fuse-parser/tests/cases/pass/variable-declaration-02/ast.snap index 06a5de3..144176a 100644 --- a/crates/fuse-parser/tests/cases/pass/variable-declaration-02/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/variable-declaration-02/ast.snap @@ -29,7 +29,7 @@ Some(Chunk( type_annotation: None, optional: false, ), - expression: Some(StringLiteral(StringLiteral( + expression: Some(Literal(String(StringLiteral( span: Span( start: 9, end: 16, @@ -40,7 +40,7 @@ Some(Chunk( end: 16, ))), ], - ))), + )))), )), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/variable-declaration-03/ast.snap b/crates/fuse-parser/tests/cases/pass/variable-declaration-03/ast.snap index 76da07e..0145cf2 100644 --- a/crates/fuse-parser/tests/cases/pass/variable-declaration-03/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/variable-declaration-03/ast.snap @@ -29,7 +29,7 @@ Some(Chunk( type_annotation: None, optional: false, ), - expression: Some(NumberLiteral(NumberLiteral( + expression: Some(Literal(Number(NumberLiteral( span: Span( start: 14, end: 17, @@ -37,7 +37,7 @@ Some(Chunk( raw: Atom("123"), value: 123.0, kind: Decimal, - ))), + )))), )), ], ), diff --git a/crates/fuse-parser/tests/cases/pass/variable-declaration-04/ast.snap b/crates/fuse-parser/tests/cases/pass/variable-declaration-04/ast.snap index f44f9d7..1116e02 100644 --- a/crates/fuse-parser/tests/cases/pass/variable-declaration-04/ast.snap +++ b/crates/fuse-parser/tests/cases/pass/variable-declaration-04/ast.snap @@ -29,7 +29,7 @@ Some(Chunk( type_annotation: None, optional: false, ), - expression: Some(NumberLiteral(NumberLiteral( + expression: Some(Literal(Number(NumberLiteral( span: Span( start: 11, end: 15, @@ -37,7 +37,7 @@ Some(Chunk( raw: Atom("3.14"), value: 3.14, kind: Float, - ))), + )))), )), ], ),