AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

replaced in main

Browse source
This commit is contained in:
Erin 2023-07-12 01:24:20 +02:00 committed by ondra05
parent b0b4022a85
commit cf05464c14
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hbasm/src/main.rs
View file

@ -1,3 +1,5 @@
use hbasm::Assembler;
use { use {
ariadne::{ColorGenerator, Label, Report, ReportKind, Source}, ariadne::{ColorGenerator, Label, Report, ReportKind, Source},
std::{ std::{
@ -10,22 +12,21 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut code = String::new(); let mut code = String::new();
stdin().read_to_string(&mut code)?; stdin().read_to_string(&mut code)?;
let mut buf = vec![]; let mut assembler = Assembler::default();
if let Err(e) = hbasm::text::assemble(&mut assembler, &code) {
if let Err(e) = hbasm::text_r::assembly(&code, &mut buf) {
let mut colors = ColorGenerator::new(); let mut colors = ColorGenerator::new();
let e_code = match e.kind { let e_code = match e.kind {
hbasm::text_r::ErrorKind::UnexpectedToken => 1, hbasm::text::ErrorKind::UnexpectedToken => 1,
hbasm::text_r::ErrorKind::InvalidToken => 2, hbasm::text::ErrorKind::InvalidToken => 2,
hbasm::text_r::ErrorKind::UnexpectedEnd => 3, hbasm::text::ErrorKind::UnexpectedEnd => 3,
hbasm::text_r::ErrorKind::InvalidSymbol => 4, hbasm::text::ErrorKind::InvalidSymbol => 4,
}; };
let message = match e.kind { let message = match e.kind {
hbasm::text_r::ErrorKind::UnexpectedToken => "This token is not expected!", hbasm::text::ErrorKind::UnexpectedToken => "This token is not expected!",
hbasm::text_r::ErrorKind::InvalidToken => "The token is not valid!", hbasm::text::ErrorKind::InvalidToken => "The token is not valid!",
hbasm::text_r::ErrorKind::UnexpectedEnd => "The assembler reached the end of input unexpectedly!", hbasm::text::ErrorKind::UnexpectedEnd => "The assembler reached the end of input unexpectedly!",
hbasm::text_r::ErrorKind::InvalidSymbol => "This referenced symbol doesn't have a corresponding label!", hbasm::text::ErrorKind::InvalidSymbol => "This referenced symbol doesn't have a corresponding label!",
}; };
let a = colors.next(); let a = colors.next();