change name

This commit is contained in:
nora 2021-12-30 12:03:55 +01:00
parent ee01a9f5b5
commit 9019dc0295
73 changed files with 152 additions and 151 deletions

View file

@ -298,3 +298,7 @@ impl CompilerError for CompileError {
self.note.clone()
}
}
#[cfg(test)]
mod test {}

View file

@ -2,7 +2,7 @@ fn main() {
if let Some(filename) = std::env::args().nth(1) {
match std::fs::read_to_string(filename) {
Ok(contents) => {
script_lang::run_program(&contents);
dilaria::run_program(&contents);
}
Err(err) => {
eprintln!("{}", err);

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 107
assertion_line: 72
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 89
assertion_line: 54
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 251
assertion_line: 249
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 267
assertion_line: 265
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 260
assertion_line: 258
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 519
assertion_line: 517
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 543
assertion_line: 541
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 560
assertion_line: 558
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 526
assertion_line: 524
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 583
assertion_line: 581
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 300
assertion_line: 298
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 309
assertion_line: 307
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 326
assertion_line: 324
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 41
assertion_line: 39
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 41
assertion_line: 39
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 41
assertion_line: 39
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 41
assertion_line: 39
expression: ast
---

View file

@ -0,0 +1,15 @@
---
source: src/parse/test.rs
assertion_line: 39
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -0,0 +1,15 @@
---
source: src/parse/test.rs
assertion_line: 39
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -0,0 +1,15 @@
---
source: src/parse/test.rs
assertion_line: 39
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -0,0 +1,15 @@
---
source: src/parse/test.rs
assertion_line: 39
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 627
assertion_line: 625
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 655
assertion_line: 653
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 620
assertion_line: 618
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 599
assertion_line: 597
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 648
assertion_line: 646
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 613
assertion_line: 611
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 634
assertion_line: 632
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 641
assertion_line: 639
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 662
assertion_line: 660
expression: ast
---

View file

@ -0,0 +1,15 @@
---
source: src/parse/test.rs
assertion_line: 604
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 687
assertion_line: 676
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 678
assertion_line: 685
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 209
assertion_line: 175
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 125
assertion_line: 90
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 148
assertion_line: 113
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 164
assertion_line: 130
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 173
assertion_line: 139
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 182
assertion_line: 148
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 193
assertion_line: 159
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 234
assertion_line: 232
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 218
assertion_line: 216
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 225
assertion_line: 223
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 193
assertion_line: 191
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 202
assertion_line: 200
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 35
assertion_line: 33
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 503
assertion_line: 501
expression: ast
---

View file

@ -1,6 +1,6 @@
---
source: src/parse/test.rs
assertion_line: 496
assertion_line: 494
expression: ast
---

View file

@ -1,15 +0,0 @@
---
source: src/parse/test.rs
assertion_line: 41
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,15 +0,0 @@
---
source: src/parse/test.rs
assertion_line: 41
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,15 +0,0 @@
---
source: src/parse/test.rs
assertion_line: 41
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,15 +0,0 @@
---
source: src/parse/test.rs
assertion_line: 41
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,15 +0,0 @@
---
source: src/parse/test.rs
assertion_line: 606
expression: ast
---
Literal(
Number(
10.0,
Span {
start: 0,
end: 0,
},
),
)

View file

@ -1,10 +1,10 @@
use crate::errors::Span;
use crate::parse::Parser;
use prelude::*;
mod prelude {
pub(super) use super::{parser, test_literal_bin_op, test_number_literal, token};
pub(super) use crate::ast::{Expr, Stmt};
pub(super) use crate::errors::Span;
pub(super) use crate::lex::{
Token,
TokenType::{self, *},
@ -28,15 +28,13 @@ fn parser(tokens: Vec<Token>) -> Parser {
}
fn test_literal_bin_op<F: FnOnce(Vec<Token<'_>>) -> Expr>(token_type: TokenType, parser: F) {
let tokens = [TokenType::Number(10.0), token_type, TokenType::Number(4.0)]
.map(token)
.into();
let tokens = [Number(10.0), token_type, Number(4.0)].map(token).into();
let ast = parser(tokens);
insta::assert_debug_snapshot!(ast);
}
fn test_number_literal<F: FnOnce(Vec<Token<'_>>) -> Expr>(parser: F) {
let tokens = [TokenType::Number(10.0)].map(token).into();
let tokens = [Number(10.0)].map(token).into();
let ast = parser(tokens);
insta::assert_debug_snapshot!(ast);
}