jeff/dust
1
0
Fork 0
Code

Begin passing tests again

Browse Source
This commit is contained in:
Jeff 2024-08-14 16:07:32 -04:00
parent fdf324c866
commit f4d29eca38
2 changed files with 109 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dust-lang/src/abstract_tree/mod.rs
View File

@ -24,6 +24,12 @@ impl AbstractSyntaxTree {
statements: VecDeque::new(),
}
}
pub fn with_statements<const LEN: usize>(statements: [Statement; LEN]) -> Self {
Self {
statements: statements.into(),
}
}
}
impl Default for AbstractSyntaxTree {

111
dust-lang/src/parser.rs
View File

@ -347,10 +347,10 @@ impl<'src> Parser<'src> {
})?;
let position = (start_position.0, self.current_position.1);
return Ok(Expression::literal(
Ok(Expression::literal(
LiteralExpression::Float(float),
position,
));
))
}
Token::Identifier(text) => {
let identifier = Identifier::new(text);
@ -502,6 +502,17 @@ impl<'src> Parser<'src> {
Token::LeftSquareBrace => {
self.next_token()?;
if let Token::RightSquareBrace = self.current_token {
let position = (start_position.0, self.current_position.1);
self.next_token()?;
return Ok(Expression::list(
ListExpression::Ordered(Vec::new()),
position,
));
}
let first_expression = self.parse_expression(0)?;
if let Token::Semicolon = self.current_token {
@ -1275,41 +1286,125 @@ mod tests {
fn empty_list() {
let source = "[]";
assert_eq!(parse(source), todo!());
assert_eq!(
parse(source),
Ok(AbstractSyntaxTree::with_statements([
Statement::Expression(Expression::list(ListExpression::Ordered(vec![]), (0, 2)))
]))
);
}
#[test]
fn float() {
let source = "42.0";
assert_eq!(parse(source), todo!());
assert_eq!(
parse(source),
Ok(AbstractSyntaxTree::with_statements([
Statement::Expression(Expression::literal(LiteralExpression::Float(42.0), (0, 4)))
]))
);
}
#[test]
fn add() {
let source = "1 + 2";
assert_eq!(parse(source), todo!());
assert_eq!(
parse(source),
Ok(AbstractSyntaxTree::with_statements([
Statement::Expression(Expression::operator(
OperatorExpression::Math {
left: Expression::literal(LiteralExpression::Integer(1), (0, 1)),
operator: Node::new(MathOperator::Add, (2, 3)),
right: Expression::literal(LiteralExpression::Integer(2), (4, 5))
},
(0, 5)
))
]))
);
}
#[test]
fn multiply() {
let source = "1 * 2";
assert_eq!(parse(source), todo!());
assert_eq!(
parse(source),
Ok(AbstractSyntaxTree::with_statements([
Statement::Expression(Expression::operator(
OperatorExpression::Math {
left: Expression::literal(LiteralExpression::Integer(1), (0, 1)),
operator: Node::new(MathOperator::Multiply, (2, 3)),
right: Expression::literal(LiteralExpression::Integer(2), (4, 5))
},
(0, 5)
))
]))
);
}
#[test]
fn add_and_multiply() {
let source = "1 + 2 * 3";
assert_eq!(parse(source), todo!());
assert_eq!(
parse(source),
Ok(AbstractSyntaxTree::with_statements([
Statement::Expression(Expression::operator(
OperatorExpression::Math {
left: Expression::literal(LiteralExpression::Integer(1), (0, 1)),
operator: Node::new(MathOperator::Add, (2, 3)),
right: Expression::operator(
OperatorExpression::Math {
left: Expression::literal(LiteralExpression::Integer(2), (4, 5)),
operator: Node::new(MathOperator::Multiply, (6, 7)),
right: Expression::literal(LiteralExpression::Integer(3), (8, 9))
},
(4, 9)
)
},
(0, 5)
))
]))
);
}
#[test]
fn assignment() {
let source = "a = 1 + 2 * 3";
assert_eq!(parse(source), todo!());
assert_eq!(
parse(source),
Ok(AbstractSyntaxTree::with_statements([
Statement::Expression(Expression::operator(
OperatorExpression::Assignment {
assignee: Expression::identifier(Identifier::new("a"), (0, 1)),
value: Expression::operator(
OperatorExpression::Math {
left: Expression::literal(LiteralExpression::Integer(1), (4, 5)),
operator: Node::new(MathOperator::Add, (6, 7)),
right: Expression::operator(
OperatorExpression::Math {
left: Expression::literal(
LiteralExpression::Integer(2),
(8, 9)
),
operator: Node::new(MathOperator::Multiply, (10, 11)),
right: Expression::literal(
LiteralExpression::Integer(3),
(12, 13)
)
},
(8, 13)
)
},
(4, 13)
)
},
(0, 13)
))
]))
);
}
}