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

Preserve numeric underscore and hexadecimal notation through formatting.

Browse Source
This commit is contained in:
KtorZ
2023-06-08 16:37:20 +02:00
parent 0b7682306f
commit 6bd8e94e17
4 changed files with 92 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/aiken-lang/src/tests/format.rs
View File

@@ -838,9 +838,10 @@ fn pipes_and_expressions() {
fn hex_and_numeric_underscore() {
let src = indoc! {r#"
fn foo() {
let a = 1_000_000
let b = 0xA4
let c = #[ 0xFD, 0x12, 0x00, 0x1B ]
let a = 1_000_000 + 1_423 + 10393841
let b = 0xa4 - 0xcd
let c = #[0xfd, 0x12, 0x00, 0x1b, 0x0a, 0x90]
let d = -100_000
}
"#};

41
crates/aiken-lang/src/tests/parser.rs
View File

@@ -3592,56 +3592,77 @@ fn int_parsing_numeric_underscore() {
fn foo() {
let i = 1_234_567
let j = 1_000_000
}
let k = -10_000
}
"#};
assert_definitions(
code,
vec![ast::Definition::Fn(Function {
arguments: vec![],
body: expr::UntypedExpr::Sequence {
location: Span::new((), 13..50),
location: Span::new((), 17..76),
expressions: vec![
expr::UntypedExpr::Assignment {
location: Span::new((), 13..30),
location: Span::new((), 17..34),
value: Box::new(expr::UntypedExpr::Int {
location: Span::new((), 21..30),
location: Span::new((), 25..34),
value: "1234567".to_string(),
base: Base::Decimal {
numeric_underscore: true,
},
}),
pattern: ast::Pattern::Var {
location: Span::new((), 17..18),
location: Span::new((), 21..22),
name: "i".to_string(),
},
kind: ast::AssignmentKind::Let,
annotation: None,
},
expr::UntypedExpr::Assignment {
location: Span::new((), 33..50),
location: Span::new((), 39..56),
value: Box::new(expr::UntypedExpr::Int {
location: Span::new((), 41..50),
location: Span::new((), 47..56),
value: "1000000".to_string(),
base: Base::Decimal {
numeric_underscore: true,
},
}),
pattern: ast::Pattern::Var {
location: Span::new((), 37..38),
location: Span::new((), 43..44),
name: "j".to_string(),
},
kind: ast::AssignmentKind::Let,
annotation: None,
},
expr::UntypedExpr::Assignment {
location: Span::new((), 61..76),
value: Box::new(expr::UntypedExpr::UnOp {
op: ast::UnOp::Negate,
location: Span::new((), 69..76),
value: Box::new(expr::UntypedExpr::Int {
location: Span::new((), 70..76),
value: "10000".to_string(),
base: Base::Decimal {
numeric_underscore: true,
},
}),
}),
pattern: ast::Pattern::Var {
location: Span::new((), 65..66),
name: "k".to_string(),
},
kind: ast::AssignmentKind::Let,
annotation: None,
},
],
},
doc: None,
location: Span::new((), 0..8),
location: Span::new((), 2..10),
name: "foo".to_string(),
public: false,
return_annotation: None,
return_type: (),
end_position: 51,
end_position: 77,
can_error: true,
})],
)