waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't break failing test defs for current users

This commit is contained in:
rvcas 2023-07-11 20:37:59 -04:00 committed by Lucas
parent 0b65c20e31
commit 13ee62c05c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/aiken-lang/src/parser/definition/test.rs
View File

@ -7,8 +7,12 @@ use crate::{
}; };
pub fn parser() -> impl Parser<Token, ast::UntypedDefinition, Error = ParseError> { pub fn parser() -> impl Parser<Token, ast::UntypedDefinition, Error = ParseError> {
just(Token::Test) // TODO: can remove Token::Bang after a few releases (curr v1.0.11)
.ignore_then(select! {Token::Name {name} => name}) just(Token::Bang)
.ignored()
.or_not()
.then_ignore(just(Token::Test))
.then(select! {Token::Name {name} => name})
.then_ignore(just(Token::LeftParen)) .then_ignore(just(Token::LeftParen))
.then_ignore(just(Token::RightParen)) .then_ignore(just(Token::RightParen))
.then(just(Token::Fail).ignored().or_not()) .then(just(Token::Fail).ignored().or_not())
@ -18,7 +22,7 @@ pub fn parser() -> impl Parser<Token, ast::UntypedDefinition, Error = ParseError
.or_not() .or_not()
.delimited_by(just(Token::LeftBrace), just(Token::RightBrace)), .delimited_by(just(Token::LeftBrace), just(Token::RightBrace)),
) )
.map_with_span(|(((name, fail), span_end), body), span| { .map_with_span(|((((old_fail, name), fail), span_end), body), span| {
ast::UntypedDefinition::Test(ast::Function { ast::UntypedDefinition::Test(ast::Function {
arguments: vec![], arguments: vec![],
body: body.unwrap_or_else(|| UntypedExpr::todo(None, span)), body: body.unwrap_or_else(|| UntypedExpr::todo(None, span)),
@ -29,7 +33,7 @@ pub fn parser() -> impl Parser<Token, ast::UntypedDefinition, Error = ParseError
public: false, public: false,
return_annotation: None, return_annotation: None,
return_type: (), return_type: (),
can_error: fail.is_some(), can_error: fail.is_some() || old_fail.is_some(),
}) })
}) })
} }