mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2026-04-05 13:56:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

better errors, colors, and fix bug where x := x would panic

Browse Source
This commit is contained in:
Mark
2023-11-16 13:09:17 +01:00
parent 39951a59e9
commit c39e784939
11 changed files with 159 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mers_lib/src/program/run/chain.rs
View File

@@ -4,7 +4,7 @@ use colored::Colorize;
use crate::data::{Data, Type};
use super::{CheckError, MersStatement, SourceRange};
use super::{error_colors, CheckError, MersStatement, SourceRange};
#[derive(Debug)]
pub struct Chain {
@@ -35,16 +35,16 @@ impl MersStatement for Chain {
return Err(CheckError::new()
.src(vec![
(self.pos_in_src, None),
(self.first.source_range(), Some(colored::Color::BrightCyan)),
(
self.chained.source_range(),
Some(colored::Color::BrightMagenta),
self.first.source_range(),
Some(error_colors::FunctionArgument),
),
(self.chained.source_range(), Some(error_colors::Function)),
])
.msg(format!(
"Can't call {} with an argument of type {}:",
"this function".bright_magenta(),
arg.to_string().bright_cyan()
"this function".color(error_colors::Function),
arg.to_string().color(error_colors::FunctionArgument)
))
.err(e))
}
@@ -53,11 +53,14 @@ impl MersStatement for Chain {
return Err(CheckError::new()
.src(vec![
(self.pos_in_src, None),
(self.chained.source_range(), Some(colored::Color::BrightRed)),
(
self.chained.source_range(),
Some(error_colors::ChainWithNonFunction),
),
])
.msg(format!(
"cannot chain with a non-function ({})",
func.to_string().bright_red()
func.to_string().color(error_colors::ChainWithNonFunction)
)));
}
}