teascade/reid-llvm
1
0
Fork 0
Code Issues Pull Requests Packages Releases 3 Wiki Activity

Update how line number is shown in errors

Browse Source
This commit is contained in:
Sofia 2025-07-28 01:43:30 +03:00
parent c9909dc651
commit 9c2f47534a
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/hello_world_harder.reid
View File

@ -6,7 +6,7 @@ fn main() {
test.push(String::from(" world: "));
test.push_num(175);
test.push_num("hello");
print(test);

32
reid/src/error_raporting.rs
View File

@ -194,32 +194,30 @@ impl std::fmt::Display for ReidError {
None
};
if curr_module != Some(meta.source_module_id) {
let module_name = if curr_module != Some(meta.source_module_id) {
curr_module = Some(meta.source_module_id);
if let Some(module) = self.map.module_map.get(&meta.source_module_id) {
writeln!(
f,
"Errors in module {}:",
color_err(format!("{}", module.name))?
)?;
module.name.clone()
} else {
writeln!(f, "Errors detected: {}", color_err("in general")?)?;
"unknown".to_owned()
}
}
} else {
"unknown".to_owned()
};
writeln!(f, "Errors detected: {}", color_err(format!("{}", module_name))?)?;
writeln!(f)?;
write!(f, " Error: ")?;
writeln!(f, "{}", color_err(format!("{}", error))?)?;
write!(
f,
"{:>20}{}",
"{:>20} {}:{}",
color_warn("At: ")?,
position
.map(|p| fmt_positions(p))
.unwrap_or(String::from("{unknown}")),
module_name,
position.map(|p| fmt_positions(p)).unwrap_or(String::from("{unknown}")),
)?;
if let (Some(position), Some(source)) =
(position, &module.and_then(|m| m.source.clone()))
{
if let (Some(position), Some(source)) = (position, &module.and_then(|m| m.source.clone())) {
writeln!(f, "{}", fmt_lines(source, position, 6)?)?;
}
}
@ -286,9 +284,9 @@ fn fmt_lines(
fn fmt_positions((start, end): (Position, Position)) -> String {
if start == end {
format!("ln {}, col {}", start.1, start.0)
format!("{}:{}", start.1, start.0)
} else if start.1 == end.1 {
format!("ln {}, col {}-{}", start.1, start.0, end.0)
format!("{}:{} - {}", start.1, start.0, end.0)
} else {
format!("{}:{} - {}:{}", start.1, start.0, end.1, end.0)
}