From cf05464c147904c0ef9d51205e3028125461f94c Mon Sep 17 00:00:00 2001 From: Erin Date: Wed, 12 Jul 2023 01:24:20 +0200 Subject: [PATCH] replaced in main --- hbasm/src/main.rs | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hbasm/src/main.rs b/hbasm/src/main.rs index 29cf888..f3abbbd 100644 --- a/hbasm/src/main.rs +++ b/hbasm/src/main.rs @@ -1,3 +1,5 @@ +use hbasm::Assembler; + use { ariadne::{ColorGenerator, Label, Report, ReportKind, Source}, std::{ @@ -10,22 +12,21 @@ fn main() -> Result<(), Box> { let mut code = String::new(); stdin().read_to_string(&mut code)?; - let mut buf = vec![]; - - if let Err(e) = hbasm::text_r::assembly(&code, &mut buf) { + let mut assembler = Assembler::default(); + if let Err(e) = hbasm::text::assemble(&mut assembler, &code) { let mut colors = ColorGenerator::new(); let e_code = match e.kind { - hbasm::text_r::ErrorKind::UnexpectedToken => 1, - hbasm::text_r::ErrorKind::InvalidToken => 2, - hbasm::text_r::ErrorKind::UnexpectedEnd => 3, - hbasm::text_r::ErrorKind::InvalidSymbol => 4, + hbasm::text::ErrorKind::UnexpectedToken => 1, + hbasm::text::ErrorKind::InvalidToken => 2, + hbasm::text::ErrorKind::UnexpectedEnd => 3, + hbasm::text::ErrorKind::InvalidSymbol => 4, }; let message = match e.kind { - hbasm::text_r::ErrorKind::UnexpectedToken => "This token is not expected!", - hbasm::text_r::ErrorKind::InvalidToken => "The token is not valid!", - hbasm::text_r::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::UnexpectedToken => "This token is not expected!", + hbasm::text::ErrorKind::InvalidToken => "The token is not valid!", + hbasm::text::ErrorKind::UnexpectedEnd => "The assembler reached the end of input unexpectedly!", + hbasm::text::ErrorKind::InvalidSymbol => "This referenced symbol doesn't have a corresponding label!", }; let a = colors.next();