mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-12-30 01:36:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug where error would reference wrong file

Browse Source
This commit is contained in:
Mark
2023-11-24 13:19:38 +01:00
parent 12af47d18a
commit 0a9eea2045
29 changed files with 173 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mers/src/main.rs
View File

@@ -1,6 +1,6 @@
use clap::{Parser, Subcommand, ValueEnum};
use mers_lib::prelude_compile::*;
use std::{fmt::Display, fs, path::PathBuf, process::exit};
use std::{fmt::Display, path::PathBuf, process::exit, sync::Arc};
mod cfg_globals;
@@ -78,10 +78,11 @@ fn main() {
},
Command::Exec { source } => Source::new_from_string(source),
};
let parsed = match parse(&mut source) {
let srca = Arc::new(source.clone());
let parsed = match parse(&mut source, &srca) {
Ok(v) => v,
Err(e) => {
eprintln!("{}", e.display(&source).show_comments(!args.hide_comments));
eprintln!("{}", e.display().show_comments(!args.hide_comments));
exit(20);
}
};
@@ -90,7 +91,7 @@ fn main() {
let run = match parsed.compile(&mut info_parsed, Default::default()) {
Ok(v) => v,
Err(e) => {
eprintln!("{}", e.display(&source).show_comments(!args.hide_comments));
eprintln!("{}", e.display().show_comments(!args.hide_comments));
exit(24);
}
};
@@ -104,7 +105,7 @@ fn main() {
let return_type = match run.check(&mut info_check, None) {
Ok(v) => v,
Err(e) => {
eprint!("{}", e.display(&source).show_comments(!args.hide_comments));
eprint!("{}", e.display().show_comments(!args.hide_comments));
exit(28);
}
};