tm85
/
kabel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diag tweaks and lexer fix (needs core fix)

This commit is contained in:
TerraMaster85 2024-01-16 23:01:12 -05:00
parent e70ff6ef9d
commit d9fc775d56
8 changed files with 54 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -55,6 +55,7 @@ dependencies = [
name = "kabel"
version = "0.1.0"
dependencies = [
"colored",
"is-terminal",
"libkabel",
"tracing-subscriber",

106
examples/try.kab
View File

@ -4,108 +4,4 @@
"aaaaaa
"aaaaaa

3
kabel/Cargo.toml
View File

@ -10,4 +10,5 @@ description = "A dead-simple scripting language for use in games"
[dependencies]
libkabel = { version = "0.1", path = "../libkabel", features = ["pretty-emitter"] }
is-terminal = "0.4"
tracing-subscriber = "0.3"
tracing-subscriber = "0.3"
colored = "2"

12
kabel/src/main.rs
View File

@ -5,6 +5,7 @@ use std::io::{self, Read};
use libkabel::diagnostics::emitters::Emitter;
use libkabel::error::KError;
use libkabel::lexer::token::Token;
use colored::Colorize;
fn main() -> Result<(), Box<dyn Error>> {
let argv: Vec<String> = env::args().collect();
@ -19,7 +20,7 @@ fn main() -> Result<(), Box<dyn Error>> {
}
Err(e) => {
eprintln!(
"Error: Tried opening `{}' and got unexpected error: {}",
"error: Tried opening file `{}' and got unexpected error: {}",
argv[1],
e.kind()
);
@ -38,7 +39,14 @@ fn main() -> Result<(), Box<dyn Error>> {
Err(e) => {
match e {
KError::InternalError(e) => {
eprintln!("ICE! Please report this to the kabel developers, along with what you were doing: {:?}", e);
eprintln!("{} {}",
"error: Internal Kabel error!".red(),
"THIS IS NOT YOUR FAULT.".bold().red());
eprintln!("{}", "error: Please report this error to the kabel developers along with your".red());
eprintln!("{}", "fail: program's complete source code. Either");
eprintln!("{}", "fail: - Open an Issue at https://git.e3t.cc/tm85/kabel, or".red());
eprintln!("{}", "fail: - E-Mail the developers at kabel@e3t.cc".red());
eprintln!("{} {:?}", "fail: Error message follows:".red(), e);
}
KError::UserError(diags) => {
//eprintln!("{}", libkabel::diagnostics::emitters::basic::BasicEmitter::emit(diags, text_source));

2
libkabel/src/diagnostics/emitters/mod.rs
View File

@ -8,4 +8,4 @@ pub(crate) mod util;
pub trait Emitter {
type Output;
fn emit(diag: Vec<Diagnostic>, source: String, source_name: String) -> Self::Output;
}
}

4
libkabel/src/diagnostics/emitters/pretty.rs
View File

@ -50,7 +50,7 @@ impl Emitter for PrettyEmitter {
let line_hdr_padding = line.to_string().len() + 1;
writeln!(output, "{}{}", " ".repeat(line_hdr_padding), "|".bright_blue().bold()).unwrap();
writeln!(output, "{}{} {} {}", line.to_string().bright_blue().bold(), " ".repeat(line_no_padding - line.to_string().len()), "|".bright_blue().bold(), get_line(line, &source).unwrap()).unwrap();
writeln!(output, "{}{} {} {}", line.to_string().bright_blue().bold(), " ".repeat(line_no_padding - line.to_string().len()), "|".bright_blue().bold(), get_line(line, &source).unwrap_or("<line unavailable>")).unwrap();
@ -107,4 +107,4 @@ impl Emitter for PrettyEmitter {
output
}
}
}

6
libkabel/src/diagnostics/emitters/util.rs
View File

@ -1,10 +1,10 @@
pub fn pos_to_line_col(pos: usize, source: &str) -> (usize, usize) {
let mut line = 0;
let mut line = 1;
let mut col = 1;
for (n, c) in source.chars().enumerate() {
if c == '\n' {
line += 1;
col = 0;
col = 1;
} else {
col += 1;
}
@ -17,4 +17,4 @@ pub fn pos_to_line_col(pos: usize, source: &str) -> (usize, usize) {
pub fn get_line(line: usize, source: &str) -> Option<&str> {
source.lines().nth(line)
}
}

45
libkabel/src/lexer/mod.rs
View File

@ -38,22 +38,45 @@ pub fn lexer(text_source: &str) -> Result<Vec<Token>, KError> {
}
State::Stringing => {
// If next char is an unescaped quote
if let Some(c_peek) = chars.peek() {
if c != '\\' && *c_peek == '\"' {
chars.next();
pos += 1;
// TODO: when possible, make this 1 `if'. Ability to
// do that remains unimplemented, hence the stupid copied
// code below.
if c != '\n' {
if let Some(c_peek) = chars.peek() {
if c != '\\' && *c_peek == '\"' {
chars.next();
pos += 1;
current_token.push(c);
let tok_cpy = current_token.clone();
lexed.push(Token::Literal(Span::new(span_start, pos), Literal::Str(tok_cpy)));
current_token.push(c);
let tok_cpy = current_token.clone();
lexed.push(Token::Literal(Span::new(span_start, pos), Literal::Str(tok_cpy)));
state = State::BuildingToken;
current_token = String::new();
state = State::BuildingToken;
current_token = String::new();
} else {
current_token.push(c);
}
} else {
current_token.push(c);
return Err(KError::UserError(vec![
Diagnostic {
diag_type: DiagnosticType::Error,
message: "unterminated string literal".to_string(),
spans: vec![
SpanWithLabel {
span: Span::new(span_start-1, span_start-1),
span_type: DiagnosticType::SecondaryError,
label: Some("string began here".to_string())
},
SpanWithLabel {
span: Span::new(pos, pos),
span_type: DiagnosticType::Error,
label: Some("expected end quote here".to_string())
}
]
}
]));
}
} else {
return Err(KError::UserError(vec![
Diagnostic {
diag_type: DiagnosticType::Error,