Noratrieb/dilaria
1
0
Fork 0
mirror of https://github.com/Noratrieb/dilaria.git synced 2026-01-16 10:25:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve error types

Browse source
This commit is contained in:
nora 2021-12-30 13:59:17 +01:00
parent 78f8382502
commit 219a7b7e37
4 changed files with 107 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/lex.rs
View file

@ -367,34 +367,37 @@ impl LexError {
}
}
impl CompilerError for LexError {
fn span(&self) -> Span {
self.span
}
fn message(&self) -> String {
match &self.kind {
LexErrorKind::InvalidCharacter(char) => format!("Unexpected character: '{}'", char),
LexErrorKind::InvalidFloat(_) => "Invalid number".to_string(),
LexErrorKind::FloatInfiniteLiteral => "Number literal too long".to_string(),
LexErrorKind::UnclosedStringLiteral => "String literal not closed".to_string(),
LexErrorKind::SingleBang => "Expected '=' after '!'".to_string(),
}
}
fn note(&self) -> Option<String> {
match &self.kind {
LexErrorKind::InvalidCharacter(_) => {
Some("Character is not allowed outside of string literals and comments".to_string())
}
LexErrorKind::InvalidFloat(err) => Some(err.to_string()),
LexErrorKind::FloatInfiniteLiteral => Some(
"A number literal cannot be larger than a 64 bit float can represent".to_string(),
),
LexErrorKind::UnclosedStringLiteral => Some("Close the literal using '\"'".to_string()),
LexErrorKind::SingleBang => {
Some("If you meant to use it for negation, use `not`".to_string())
}
impl From<LexError> for CompilerError {
fn from(error: LexError) -> Self {
Self {
span: { error.span },
message: {
match &error.kind {
LexErrorKind::InvalidCharacter(char) => {
format!("Unexpected character: '{}'", char)
}
LexErrorKind::InvalidFloat(_) => "Invalid number".to_string(),
LexErrorKind::FloatInfiniteLiteral => "Number literal too long".to_string(),
LexErrorKind::UnclosedStringLiteral => "String literal not closed".to_string(),
LexErrorKind::SingleBang => "Expected '=' after '!'".to_string(),
}
},
note: match &error.kind {
LexErrorKind::InvalidCharacter(_) => Some(
"Character is not allowed outside of string literals and comments".to_string(),
),
LexErrorKind::InvalidFloat(err) => Some(err.to_string()),
LexErrorKind::FloatInfiniteLiteral => Some(
"A number literal cannot be larger than a 64 bit float can represent"
.to_string(),
),
LexErrorKind::UnclosedStringLiteral => {
Some("Close the literal using '\"'".to_string())
}
LexErrorKind::SingleBang => {
Some("If you meant to use it for negation, use `not`".to_string())
}
},
}
}
}