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

feat: use pretty assert

This commit is contained in:
rvcas 2022-09-26 17:04:54 -04:00
parent 81dd826ab8
commit 119a6f1e77
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
4 changed files with 82 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Cargo.lock generated
View File

@ -46,6 +46,7 @@ dependencies = [
"chumsky", "chumsky",
"internment", "internment",
"miette", "miette",
"pretty_assertions",
"vec1", "vec1",
] ]
@ -205,6 +206,22 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "129eabb7b0b78644a3a7e7cf220714aba47463bb281f69fa7a71ca5d12564cca" checksum = "129eabb7b0b78644a3a7e7cf220714aba47463bb281f69fa7a71ca5d12564cca"
[[package]]
name = "ctor"
version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
dependencies = [
"quote",
"syn",
]
[[package]]
name = "diff"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]] [[package]]
name = "fastrand" name = "fastrand"
version = "1.8.0" version = "1.8.0"
@ -407,6 +424,15 @@ version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
[[package]]
name = "output_vt100"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "pallas-addresses" name = "pallas-addresses"
version = "0.14.0-alpha.4" version = "0.14.0-alpha.4"
@ -544,6 +570,18 @@ dependencies = [
"unicode-segmentation", "unicode-segmentation",
] ]
[[package]]
name = "pretty_assertions"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
dependencies = [
"ctor",
"diff",
"output_vt100",
"yansi",
]
[[package]] [[package]]
name = "proc-macro-error" name = "proc-macro-error"
version = "1.0.4" version = "1.0.4"
@ -968,3 +1006,9 @@ name = "windows_x86_64_msvc"
version = "0.36.1" version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
[[package]]
name = "yansi"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"

3
crates/lang/Cargo.toml
View File

@ -10,3 +10,6 @@ chumsky = "0.8.0"
internment = "0.7.0" internment = "0.7.0"
miette = "5.2.0" miette = "5.2.0"
vec1 = "1.8.0" vec1 = "1.8.0"
[dev-dependencies]
pretty_assertions = "1.3.0"

1
crates/lang/src/error.rs
View File

@ -6,6 +6,7 @@ use crate::{ast::Span, token::Token};
pub struct ParseError { pub struct ParseError {
kind: ErrorKind, kind: ErrorKind,
span: Span, span: Span,
#[allow(dead_code)]
while_parsing: Option<(Span, &'static str)>, while_parsing: Option<(Span, &'static str)>,
expected: HashSet<Pattern>, expected: HashSet<Pattern>,
label: Option<&'static str>, label: Option<&'static str>,

76
crates/lang/src/parser.rs
View File

@ -250,7 +250,7 @@ pub fn expr_seq_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseE
}), }),
expr_parser() expr_parser()
.then(r.repeated()) .then(r.repeated())
.map_with_span(|(expr, exprs), span| { .map_with_span(|(expr, exprs), _span| {
exprs exprs
.into_iter() .into_iter()
.fold(expr, |acc, elem| acc.append_in_sequence(elem)) .fold(expr, |acc, elem| acc.append_in_sequence(elem))
@ -260,7 +260,7 @@ pub fn expr_seq_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseE
} }
pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError> { pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError> {
recursive(|r| { recursive(|_r| {
let op = choice(( let op = choice((
just(Token::Star).to(BinOp::MultInt), just(Token::Star).to(BinOp::MultInt),
just(Token::Slash).to(BinOp::DivInt), just(Token::Slash).to(BinOp::DivInt),
@ -282,7 +282,7 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
just(Token::Minus).to(BinOp::SubInt), just(Token::Minus).to(BinOp::SubInt),
)); ));
let sum = product product
.clone() .clone()
.then(op.then(product).repeated()) .then(op.then(product).repeated())
.foldl(|a, (op, b)| expr::UntypedExpr::BinOp { .foldl(|a, (op, b)| expr::UntypedExpr::BinOp {
@ -290,9 +290,7 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
name: op, name: op,
left: Box::new(a), left: Box::new(a),
right: Box::new(b), right: Box::new(b),
}); })
sum
}) })
} }
@ -544,6 +542,7 @@ pub fn pattern_parser() -> impl Parser<Token, ast::UntypedPattern, Error = Parse
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use chumsky::prelude::*; use chumsky::prelude::*;
use pretty_assertions::assert_eq;
use crate::{ use crate::{
ast::{self, Span, SrcId}, ast::{self, Span, SrcId},
@ -575,11 +574,6 @@ mod tests {
pub fn add_one(a) { pub fn add_one(a) {
a + 1 a + 1
} }
pub fn add_one(a: Int) -> Int {
[1, 2, 3]
|> list.map(fn(x) { x + a })
}
"#; "#;
let len = code.chars().count(); let len = code.chars().count();
@ -639,31 +633,31 @@ mod tests {
package: (), package: (),
}, },
ast::UntypedDefinition::DataType { ast::UntypedDefinition::DataType {
location: Span::new(SrcId::empty(), 122..246), location: Span::new(SrcId::empty(), 122..240),
constructors: vec![ constructors: vec![
ast::RecordConstructor { ast::RecordConstructor {
location: Span::new(SrcId::empty(), 155..167), location: Span::new(SrcId::empty(), 153..165),
name: "Some".to_string(), name: "Some".to_string(),
arguments: vec![ arguments: vec![
ast::RecordConstructorArg { ast::RecordConstructorArg {
label: None, label: None,
annotation: ast::Annotation::Var { annotation: ast::Annotation::Var {
location: Span::new(SrcId::empty(), 160..161), location: Span::new(SrcId::empty(), 158..159),
name: "a".to_string(), name: "a".to_string(),
}, },
location: Span::new(SrcId::empty(), 160..161), location: Span::new(SrcId::empty(), 158..159),
tipo: (), tipo: (),
doc: None, doc: None,
}, },
ast::RecordConstructorArg { ast::RecordConstructorArg {
label: None, label: None,
annotation: ast::Annotation::Constructor { annotation: ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 163..166), location: Span::new(SrcId::empty(), 161..164),
module: None, module: None,
name: "Int".to_string(), name: "Int".to_string(),
arguments: vec![], arguments: vec![],
}, },
location: Span::new(SrcId::empty(), 163..166), location: Span::new(SrcId::empty(), 161..164),
tipo: (), tipo: (),
doc: None, doc: None,
}, },
@ -672,37 +666,37 @@ mod tests {
sugar: false, sugar: false,
}, },
ast::RecordConstructor { ast::RecordConstructor {
location: Span::new(SrcId::empty(), 184..188), location: Span::new(SrcId::empty(), 180..184),
name: "None".to_string(), name: "None".to_string(),
arguments: vec![], arguments: vec![],
documentation: None, documentation: None,
sugar: false, sugar: false,
}, },
ast::RecordConstructor { ast::RecordConstructor {
location: Span::new(SrcId::empty(), 205..232), location: Span::new(SrcId::empty(), 199..226),
name: "Wow".to_string(), name: "Wow".to_string(),
arguments: vec![ arguments: vec![
ast::RecordConstructorArg { ast::RecordConstructorArg {
label: Some("name".to_string(),), label: Some("name".to_string(),),
annotation: ast::Annotation::Constructor { annotation: ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 217..220), location: Span::new(SrcId::empty(), 211..214),
module: None, module: None,
name: "Int".to_string(), name: "Int".to_string(),
arguments: vec![], arguments: vec![],
}, },
location: Span::new(SrcId::empty(), 211..220), location: Span::new(SrcId::empty(), 205..214),
tipo: (), tipo: (),
doc: None, doc: None,
}, },
ast::RecordConstructorArg { ast::RecordConstructorArg {
label: Some("age".to_string(),), label: Some("age".to_string(),),
annotation: ast::Annotation::Constructor { annotation: ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 227..230), location: Span::new(SrcId::empty(), 221..224),
module: None, module: None,
name: "Int".to_string(), name: "Int".to_string(),
arguments: vec![], arguments: vec![],
}, },
location: Span::new(SrcId::empty(), 222..230), location: Span::new(SrcId::empty(), 216..224),
tipo: (), tipo: (),
doc: None, doc: None,
}, },
@ -719,17 +713,17 @@ mod tests {
typed_parameters: vec![], typed_parameters: vec![],
}, },
ast::UntypedDefinition::DataType { ast::UntypedDefinition::DataType {
location: Span::new(SrcId::empty(), 260..321), location: Span::new(SrcId::empty(), 254..313),
constructors: vec![ast::RecordConstructor { constructors: vec![ast::RecordConstructor {
location: Span::new(SrcId::empty(), 281..321), location: Span::new(SrcId::empty(), 275..313),
name: "User".to_string(), name: "User".to_string(),
arguments: vec![ast::RecordConstructorArg { arguments: vec![ast::RecordConstructorArg {
label: Some("name".to_string(),), label: Some("name".to_string()),
annotation: ast::Annotation::Hole { annotation: ast::Annotation::Hole {
location: Span::new(SrcId::empty(), 305..307), location: Span::new(SrcId::empty(), 297..299),
name: "_w".to_string(), name: "_w".to_string(),
}, },
location: Span::new(SrcId::empty(), 299..307), location: Span::new(SrcId::empty(), 291..299),
tipo: (), tipo: (),
doc: None, doc: None,
},], },],
@ -746,18 +740,18 @@ mod tests {
ast::UntypedDefinition::TypeAlias { ast::UntypedDefinition::TypeAlias {
alias: "Thing".to_string(), alias: "Thing".to_string(),
annotation: ast::Annotation::Constructor { annotation: ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 348..359), location: Span::new(SrcId::empty(), 340..351),
module: None, module: None,
name: "Option".to_string(), name: "Option".to_string(),
arguments: vec![ast::Annotation::Constructor { arguments: vec![ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 355..358), location: Span::new(SrcId::empty(), 347..350),
module: None, module: None,
name: "Int".to_string(), name: "Int".to_string(),
arguments: vec![], arguments: vec![],
},], },],
}, },
doc: None, doc: None,
location: Span::new(SrcId::empty(), 335..359), location: Span::new(SrcId::empty(), 327..351),
parameters: vec![], parameters: vec![],
public: false, public: false,
tipo: (), tipo: (),
@ -765,18 +759,18 @@ mod tests {
ast::UntypedDefinition::TypeAlias { ast::UntypedDefinition::TypeAlias {
alias: "Me".to_string(), alias: "Me".to_string(),
annotation: ast::Annotation::Constructor { annotation: ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 387..401), location: Span::new(SrcId::empty(), 379..393),
module: None, module: None,
name: "Option".to_string(), name: "Option".to_string(),
arguments: vec![ast::Annotation::Constructor { arguments: vec![ast::Annotation::Constructor {
location: Span::new(SrcId::empty(), 394..400), location: Span::new(SrcId::empty(), 386..392),
module: None, module: None,
name: "String".to_string(), name: "String".to_string(),
arguments: vec![], arguments: vec![],
},], },],
}, },
doc: None, doc: None,
location: Span::new(SrcId::empty(), 373..401), location: Span::new(SrcId::empty(), 365..393),
parameters: vec![], parameters: vec![],
public: true, public: true,
tipo: (), tipo: (),
@ -785,26 +779,26 @@ mod tests {
arguments: vec![ast::Arg { arguments: vec![ast::Arg {
arg_name: ast::ArgName::Named { arg_name: ast::ArgName::Named {
name: "a".to_string(), name: "a".to_string(),
location: Span::new(SrcId::empty(), 430..431), location: Span::new(SrcId::empty(), 422..423),
}, },
location: Span::new(SrcId::empty(), 430..431), location: Span::new(SrcId::empty(), 422..423),
annotation: None, annotation: None,
tipo: (), tipo: (),
},], },],
body: expr::UntypedExpr::BinOp { body: expr::UntypedExpr::BinOp {
location: Span::new(SrcId::empty(), 451..456), location: Span::new(SrcId::empty(), 441..446),
name: ast::BinOp::AddInt, name: ast::BinOp::AddInt,
left: Box::new(expr::UntypedExpr::Var { left: Box::new(expr::UntypedExpr::Var {
location: Span::new(SrcId::empty(), 451..452), location: Span::new(SrcId::empty(), 441..442),
name: "a".to_string(), name: "a".to_string(),
}), }),
right: Box::new(expr::UntypedExpr::Int { right: Box::new(expr::UntypedExpr::Int {
location: Span::new(SrcId::empty(), 455..456), location: Span::new(SrcId::empty(), 445..446),
value: "1".to_string(), value: "1".to_string(),
}), }),
}, },
doc: None, doc: None,
location: Span::new(SrcId::empty(), 415..470), location: Span::new(SrcId::empty(), 407..460),
name: "add_one".to_string(), name: "add_one".to_string(),
public: true, public: true,
return_annotation: None, return_annotation: None,
@ -812,8 +806,6 @@ mod tests {
}, },
] ]
}, },
"{:#?}",
res,
); );
} }
} }