jeff/dust
1
0
Fork 0
Code

Clean up main.rs

Browse Source
This commit is contained in:
Jeff 2024-11-05 17:39:04 -05:00
parent b0af1609f0
commit dd13d2efee
1 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dust-shell/src/main.rs
View File

@ -80,23 +80,6 @@ fn main() {
let line_numbers = args.format_line_numbers.unwrap_or(true); let line_numbers = args.format_line_numbers.unwrap_or(true);
let colored = args.format_colored.unwrap_or(true); let colored = args.format_colored.unwrap_or(true);
format_source(source, line_numbers, colored);
}
if args.parse {
let style = args.style_disassembly.unwrap_or(true);
parse_source(source, style);
}
if args.format || args.parse {
return;
}
run_source(source);
}
fn format_source(source: &str, line_numbers: bool, colored: bool) {
log::info!("Formatting source"); log::info!("Formatting source");
match format(source, line_numbers, colored) { match format(source, line_numbers, colored) {
@ -105,9 +88,13 @@ fn format_source(source: &str, line_numbers: bool, colored: bool) {
eprintln!("{}", error.report()); eprintln!("{}", error.report());
} }
} }
} }
if args.parse {
let styled = args.style_disassembly.unwrap_or(true);
log::info!("Parsing source");
fn parse_source(source: &str, styled: bool) {
match parse(source) { match parse(source) {
Ok(chunk) => { Ok(chunk) => {
let disassembly = chunk let disassembly = chunk
@ -122,9 +109,12 @@ fn parse_source(source: &str, styled: bool) {
eprintln!("{}", error.report()); eprintln!("{}", error.report());
} }
} }
} }
if args.format || args.parse {
return;
}
fn run_source(source: &str) {
match run(source) { match run(source) {
Ok(Some(value)) => println!("{}", value), Ok(Some(value)) => println!("{}", value),
Ok(None) => {} Ok(None) => {}