From d76202458300e6a7aa0d45b76450912be255e0d1 Mon Sep 17 00:00:00 2001 From: Auca Maillot Date: Sat, 13 Dec 2025 14:06:38 -0300 Subject: [PATCH 1/2] normalize new lines in tests (\r\n) --- .gitattributes | 1 + src/test.rs | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..94f480d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf \ No newline at end of file diff --git a/src/test.rs b/src/test.rs index 0b4d356..8f81b50 100644 --- a/src/test.rs +++ b/src/test.rs @@ -8,7 +8,10 @@ use std::path::Path; fn evaluate_example(fname: &Path) -> String { let mut compiler = Compiler::new(); - let contents = std::fs::read(fname).expect("We only run tests found by glob"); + let contents = std::fs::read_to_string(fname).expect("We only run tests found by glob"); + // normalize newlines + let replaced = contents.replace("\r\n", "\n"); + let contents = replaced.as_bytes(); let span_offset = compiler.span_offset(); compiler.add_file(&fname.to_string_lossy(), &contents); @@ -53,11 +56,10 @@ fn evaluate_example(fname: &Path) -> String { } fn evaluate_lexer(fname: &Path) -> String { - let contents = std::fs::read(fname); - - let Ok(contents) = contents else { - panic!("Lexer: can't find file {}", fname.to_string_lossy()); - }; + let contents = std::fs::read_to_string(fname).expect("We only run tests found by glob"); + // normalize newlines + let replaced = contents.replace("\r\n", "\n"); + let contents = replaced.as_bytes(); let (tokens, err) = lex(&contents, 0); let mut res = tokens.display(&contents); From f4578cf097b59d45b27ca30b99e4b34954796c50 Mon Sep 17 00:00:00 2001 From: Auca Maillot Date: Sat, 13 Dec 2025 14:12:15 -0300 Subject: [PATCH 2/2] remove unnecesary references --- src/test.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test.rs b/src/test.rs index 8f81b50..3b29e45 100644 --- a/src/test.rs +++ b/src/test.rs @@ -14,11 +14,11 @@ fn evaluate_example(fname: &Path) -> String { let contents = replaced.as_bytes(); let span_offset = compiler.span_offset(); - compiler.add_file(&fname.to_string_lossy(), &contents); + compiler.add_file(&fname.to_string_lossy(), contents); - let (tokens, err) = lex(&contents, span_offset); + let (tokens, err) = lex(contents, span_offset); if let Err(e) = err { - tokens.eprint(&contents); + tokens.eprint(contents); eprintln!("Lexing error. Error: {:?}", e); std::process::exit(1); } @@ -61,8 +61,8 @@ fn evaluate_lexer(fname: &Path) -> String { let replaced = contents.replace("\r\n", "\n"); let contents = replaced.as_bytes(); - let (tokens, err) = lex(&contents, 0); - let mut res = tokens.display(&contents); + let (tokens, err) = lex(contents, 0); + let mut res = tokens.display(contents); if let Err(e) = err { res.push_str(&format!("Lexing error. Error: {:?}", e));