treewide: fmt

This commit is contained in:
raf 2025-05-24 23:41:06 +03:00
commit 10a525b2e7
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
5 changed files with 326 additions and 206 deletions

View file

@ -4,17 +4,17 @@ mod lexer;
mod parser;
mod syntax;
use anyhow::{Context, Result};
use clap::Parser;
use std::fs;
use std::io::{self, Write};
use std::path::Path;
use clap::Parser;
use anyhow::{Context, Result};
use thiserror::Error;
use crate::cst::CstBuilder;
use crate::lexer::NftablesLexer;
use crate::parser::Parser as NftablesParser;
use crate::syntax::{FormatConfig, IndentStyle, NftablesFormatter};
use crate::cst::CstBuilder;
#[derive(Error, Debug)]
enum FormatterError {
@ -85,14 +85,18 @@ fn process_nftables_config(args: Args) -> Result<()> {
// Use error-recovery tokenization for debug mode
lexer.tokenize_with_errors()
} else {
lexer.tokenize()
lexer
.tokenize()
.map_err(|e| FormatterError::ParseError(e.to_string()))?
};
if args.debug {
eprintln!("=== TOKENS ===");
for (i, token) in tokens.iter().enumerate() {
eprintln!("{:3}: {:?} @ {:?} = '{}'", i, token.kind, token.range, token.text);
eprintln!(
"{:3}: {:?} @ {:?} = '{}'",
i, token.kind, token.range, token.text
);
}
eprintln!();
@ -126,7 +130,8 @@ fn process_nftables_config(args: Args) -> Result<()> {
parsed_ruleset.unwrap_or_else(|| crate::ast::Ruleset::new())
} else {
let mut parser = NftablesParser::new(tokens.clone());
parser.parse()
parser
.parse()
.map_err(|e| FormatterError::ParseError(e.to_string()))?
};
@ -160,7 +165,8 @@ fn process_nftables_config(args: Args) -> Result<()> {
println!("Formatted output written to: {}", output_file);
}
None => {
io::stdout().write_all(formatted_output.as_bytes())
io::stdout()
.write_all(formatted_output.as_bytes())
.with_context(|| "Failed to write to stdout")?;
}
}