alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Make agb_xm_core generic on parsing

Browse source
This commit is contained in:
Gwilym Inzani 2024-09-24 20:56:55 +01:00
parent 5b9332556d
commit 2d69b2a7a4
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tracker/agb-xm/src/lib.rs
View file

@ -10,10 +10,13 @@ use xmrs::{module::Module, xm::xmmodule::XmModule};
#[proc_macro_error]
#[proc_macro]
pub fn include_xm(args: TokenStream) -> TokenStream {
agb_xm_core(args)
agb_xm_core(args, parse_xm)
}
fn agb_xm_core(args: TokenStream) -> TokenStream {
fn agb_xm_core(
args: TokenStream,
load_module: impl Fn(&[u8]) -> Result<Module, Box<dyn Error>>,
) -> TokenStream {
let input = match syn::parse::<LitStr>(args) {
Ok(input) => input,
Err(err) => return err.to_compile_error().into(),
@ -26,7 +29,12 @@ fn agb_xm_core(args: TokenStream) -> TokenStream {
let include_path = path.to_string_lossy();
let module = match load_module_from_file(&path) {
let file_content = match fs::read(&path) {
Ok(content) => content,
Err(e) => abort!(input, e),
};
let module = match load_module(&file_content) {
Ok(track) => track,
Err(e) => abort!(input, e),
};
@ -43,7 +51,6 @@ fn agb_xm_core(args: TokenStream) -> TokenStream {
.into()
}
fn load_module_from_file(xm_path: &Path) -> Result<Module, Box<dyn Error>> {
let file_content = fs::read(xm_path)?;
Ok(XmModule::load(&file_content)?.to_module())
fn parse_xm(file_content: &[u8]) -> Result<Module, Box<dyn Error>> {
Ok(XmModule::load(file_content)?.to_module())
}