Better error messages.

This commit is contained in:
2025-09-29 11:42:34 +02:00
parent 54e4c065ca
commit 2ede3db3b8
2 changed files with 31 additions and 23 deletions

View File

@@ -6,11 +6,14 @@ use std::boxed::Box;
// Read 1KiB of the file at a time.
static BLOCK_SIZE:usize = 1024;
pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> io::Result<()> {
pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String> {
let mut in_reader:Box<dyn io::Read> = match in_path {
Some(x) => {
let in_file = fs::File::open(x)?;
Box::new(io::BufReader::new(in_file))
Some(path) => {
let in_file = fs::File::open(path);
if let Err(e) = in_file {
return Err(format!("{path}: {e}"));
}
Box::new(io::BufReader::new(in_file.unwrap()))
},
None => {
Box::new(io::stdin())
@@ -18,9 +21,12 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> io::Result<()> {
};
let mut out_writer:Box<dyn io::Write> = match out_path {
Some(x) => {
let out_file = fs::File::create(x)?;
Box::new(io::BufWriter::new(out_file))
Some(path) => {
let out_file = fs::File::create(path);
if let Err(e) = out_file {
return Err(format!("{path}: {e}"));
}
Box::new(io::BufWriter::new(out_file.unwrap()))
},
None => {
Box::new(io::stdout())
@@ -31,37 +37,37 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> io::Result<()> {
let mut last_ch:char = '\0';
let mut tab_num = 0;
while in_reader.read(&mut read_buf)? > 0 {
while in_reader.read(&mut read_buf).unwrap() > 0 {
for i in read_buf {
let ch = i as char;
match ch {
'[' | '{' => {
tab_num += 1;
out_writer.write(format!("{}\n", ch).as_bytes())?;
out_writer.write(format!("{}\n", ch).as_bytes()).unwrap();
for _ in 0..tab_num {
out_writer.write(b" ")?;
out_writer.write(b" ").unwrap();
}
last_ch = ' ';
},
']' | '}' => {
tab_num -= 1;
out_writer.write(b"\n")?;
out_writer.write(b"\n").unwrap();
for _ in 0..tab_num {
out_writer.write(b" ")?;
out_writer.write(b" ").unwrap();
}
out_writer.write(format!("{}", ch).as_bytes())?;
out_writer.write(format!("{}", ch).as_bytes()).unwrap();
last_ch = ch;
},
',' => {
out_writer.write(format!("{}\n", ch).as_bytes())?;
out_writer.write(format!("{}\n", ch).as_bytes()).unwrap();
for _ in 0..tab_num {
out_writer.write(b" ")?;
out_writer.write(b" ").unwrap();
}
last_ch = ' ';
},
_ => {
if ch != ' ' || last_ch != ' ' {
out_writer.write(format!("{}", ch).as_bytes())?;
out_writer.write(format!("{}", ch).as_bytes()).unwrap();
last_ch = ch;
}
},
@@ -69,8 +75,7 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> io::Result<()> {
}
}
out_writer.flush()?;
out_writer.flush().unwrap();
Ok(())
}