refactor: AssetParser -> Parser.

It also removes all the `extension` things. sed sucks btw.
nenikitov · Oct 14, 2024 · fa20872 · fa20872
1 parent 7ccca1c
commit fa20872
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 144 deletions.
diff --git a/ashen/src/asset/color_map.rs b/ashen/src/asset/color_map.rs
@@ -1,6 +1,6 @@
 use std::ops::Deref;
 
-use super::{extension::*, AssetParser};
+use super::AssetParser;
 use crate::{error, utils::nom::*};
 
 const COLORS_COUNT: usize = 256;
@@ -35,7 +35,7 @@ impl Color {
     }
 }
 
-impl AssetParser<Wildcard> for Color {
+impl AssetParser for Color {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -55,7 +55,7 @@ pub struct ColorMap {
     pub shades: Box<[[Color; COLORS_COUNT]; SHADES_COUNT]>,
 }
 
-impl AssetParser<Pack> for ColorMap {
+impl AssetParser for ColorMap {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -155,7 +155,7 @@ mod tests {
     #[test]
     #[ignore = "uses Ashen ROM files"]
     fn parse_rom_asset() -> eyre::Result<()> {
-        let (_, color_map) = <ColorMap as AssetParser<Pack>>::parser(())(&COLOR_MAP_DATA)?;
+        let (_, color_map) = <ColorMap as AssetParser>::parser(())(&COLOR_MAP_DATA)?;
 
         output_file(
             parsed_file_path!("color-map/monsters.png"),

diff --git a/ashen/src/asset/gamma_table.rs b/ashen/src/asset/gamma_table.rs
@@ -1,6 +1,6 @@
 use std::mem;
 
-use super::{extension::*, AssetParser};
+use super::AssetParser;
 use crate::{error, utils::nom::*};
 
 const ROWS_COUNT: usize = 256;
@@ -12,7 +12,7 @@ pub struct GammaTable {
     pub lookups: Box<[[u8; ROWS_COUNT]; COLS_COUNT]>,
 }
 
-impl AssetParser<Pack> for GammaTable {
+impl AssetParser for GammaTable {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -61,7 +61,7 @@ mod tests {
     #[test]
     #[ignore = "uses Ashen ROM files"]
     fn parse_rom_asset() -> eyre::Result<()> {
-        let (_, gamma_table) = <GammaTable as AssetParser<Pack>>::parser(())(&GAMMA_TABLE_DATA)?;
+        let (_, gamma_table) = <GammaTable as AssetParser>::parser(())(&GAMMA_TABLE_DATA)?;
 
         let gamma_table = gamma_table
             .lookups

diff --git a/ashen/src/asset/mod.rs b/ashen/src/asset/mod.rs
@@ -10,55 +10,7 @@ pub mod texture;
 
 use crate::utils::nom::{Input, Result};
 
-/// Definition for all available extensions that the engine can parse.
-pub mod extension {
-    #[sealed::sealed]
-    pub trait Extension: AsRef<str> + for<'str> TryFrom<&'str str> {}
-
-    #[derive(Debug, thiserror::Error)]
-    #[error("The provided extension is invalid '{}'", self.0)]
-    pub struct ExtensionMismatchError(String);
-
-    macro_rules! impl_extension {
-        ($(#[$docs:meta])+ $name:ident => $ext:literal) => {
-            $(#[$docs])+
-            pub struct $name;
-
-            impl AsRef<str> for $name {
-                fn as_ref(&self) -> &str {
-                    $ext
-                }
-            }
-
-            impl TryFrom<&str> for $name {
-                type Error = ExtensionMismatchError;
-
-                fn try_from(value: &str) -> Result<Self, Self::Error> {
-                    if value == $ext {
-                        Ok(Self)
-                    } else {
-                        Err(ExtensionMismatchError(value.to_owned()))
-                    }
-                }
-            }
-
-            #[sealed::sealed]
-            impl Extension for $name {}
-        };
-    }
-
-    impl_extension!(
-        /// Wildcard
-        Wildcard => "*"
-    );
-
-    impl_extension!(
-        /// Extension that implies that the asset comes from ashen's files (packfile).
-        Pack => "pack"
-    );
-}
-
-pub trait AssetParser<Ext>
+pub trait AssetParser
 where
     Self: Sized,
 {

diff --git a/ashen/src/asset/model/dat/frame.rs b/ashen/src/asset/model/dat/frame.rs
@@ -1,7 +1,4 @@
-use crate::{
-    asset::{extension::*, AssetParser},
-    utils::nom::*,
-};
+use crate::{asset::AssetParser, utils::nom::*};
 
 // TODO(nenikitov): Should probably be a fancy utility class
 // With generics for data type and dimension
@@ -12,7 +9,7 @@ pub struct Vec3 {
     pub z: f32,
 }
 
-impl AssetParser<Wildcard> for Vec3 {
+impl AssetParser for Vec3 {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -52,7 +49,7 @@ pub struct VertexTransform {
     origin: Vec3,
 }
 
-impl AssetParser<Wildcard> for ModelVertex {
+impl AssetParser for ModelVertex {
     type Output = Self;
 
     type Context<'ctx> = VertexTransform;
@@ -97,7 +94,7 @@ pub struct ModelSpecs {
     pub frame_size: u32,
 }
 
-impl AssetParser<Wildcard> for ModelFrame {
+impl AssetParser for ModelFrame {
     type Output = Self;
 
     type Context<'ctx> = ModelSpecs;

diff --git a/ashen/src/asset/model/dat/header.rs b/ashen/src/asset/model/dat/header.rs
@@ -1,7 +1,4 @@
-use crate::{
-    asset::{extension::*, AssetParser},
-    utils::nom::*,
-};
+use crate::{asset::AssetParser, utils::nom::*};
 
 pub struct ModelHeader {
     pub triangle_count: u32,
@@ -18,7 +15,7 @@ pub struct ModelHeader {
     pub locator_nodes: [u8; 16],
 }
 
-impl AssetParser<Wildcard> for ModelHeader {
+impl AssetParser for ModelHeader {
     type Output = Self;
 
     type Context<'ctx> = ();

diff --git a/ashen/src/asset/model/dat/sequence.rs b/ashen/src/asset/model/dat/sequence.rs
@@ -1,13 +1,10 @@
-use crate::{
-    asset::{extension::*, AssetParser},
-    utils::nom::*,
-};
+use crate::{asset::AssetParser, utils::nom::*};
 
 pub struct ModelSequence {
     pub frames: Vec<u32>,
 }
 
-impl AssetParser<Wildcard> for ModelSequence {
+impl AssetParser for ModelSequence {
     type Output = Self;
 
     // TODO(nenikitov): Maybe refactor it to not accept full input.

diff --git a/ashen/src/asset/model/dat/triangle.rs b/ashen/src/asset/model/dat/triangle.rs
@@ -1,7 +1,4 @@
-use crate::{
-    asset::{extension::*, AssetParser},
-    utils::nom::*,
-};
+use crate::{asset::AssetParser, utils::nom::*};
 
 pub struct ModelPoint {
     pub vertex_index: u16,
@@ -14,7 +11,7 @@ pub struct TextureDimensions {
     pub height: u32,
 }
 
-impl AssetParser<Wildcard> for ModelPoint {
+impl AssetParser for ModelPoint {
     type Output = Self;
 
     type Context<'ctx> = &'ctx TextureDimensions;
@@ -39,7 +36,7 @@ pub struct ModelTriangle {
     pub points: [ModelPoint; 3],
 }
 
-impl AssetParser<Wildcard> for ModelTriangle {
+impl AssetParser for ModelTriangle {
     type Output = Self;
 
     type Context<'ctx> = TextureDimensions;

diff --git a/ashen/src/asset/model/mod.rs b/ashen/src/asset/model/mod.rs
@@ -8,7 +8,6 @@ use dat::{
 };
 
 use super::{
-    extension::*,
     texture::{Texture, TextureSize},
     AssetParser,
 };
@@ -21,7 +20,7 @@ pub struct Model {
     pub frames: Vec<ModelFrame>,
 }
 
-impl AssetParser<Pack> for Model {
+impl AssetParser for Model {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -95,9 +94,9 @@ mod tests {
     #[test]
     #[ignore = "uses Ashen ROM files"]
     fn parse_rom_asset() -> eyre::Result<()> {
-        let (_, model) = <Model as AssetParser<Pack>>::parser(())(&MODEL_DATA)?;
+        let (_, model) = <Model as AssetParser>::parser(())(&MODEL_DATA)?;
         let palette = {
-            let (_, color_map) = <ColorMap as AssetParser<Pack>>::parser(())(&COLOR_MAP_DATA)?;
+            let (_, color_map) = <ColorMap as AssetParser>::parser(())(&COLOR_MAP_DATA)?;
             color_map.shades[15]
         };
 

diff --git a/ashen/src/asset/pack_info.rs b/ashen/src/asset/pack_info.rs
@@ -1,6 +1,6 @@
 use std::ops::Index;
 
-use super::{extension::*, AssetParser};
+use super::AssetParser;
 use crate::utils::nom::*;
 
 #[derive(Debug)]
@@ -9,7 +9,7 @@ pub struct PackInfo {
     pub size: u32,
 }
 
-impl AssetParser<Wildcard> for PackInfo {
+impl AssetParser for PackInfo {
     type Output = Self;
 
     type Context<'ctx> = ();

diff --git a/ashen/src/asset/skybox.rs b/ashen/src/asset/skybox.rs
@@ -1,5 +1,4 @@
 use super::{
-    extension::*,
     texture::{Texture, TextureSize},
     AssetParser,
 };
@@ -12,7 +11,7 @@ pub struct Skybox {
     pub texture: Texture,
 }
 
-impl AssetParser<Pack> for Skybox {
+impl AssetParser for Skybox {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -51,7 +50,7 @@ mod tests {
     #[test]
     #[ignore = "uses Ashen ROM files"]
     fn parse_rom_asset() -> eyre::Result<()> {
-        let (_, skybox) = <Skybox as AssetParser<Pack>>::parser(())(&SKYBOX_DATA)?;
+        let (_, skybox) = <Skybox as AssetParser>::parser(())(&SKYBOX_DATA)?;
 
         output_file(
             parsed_file_path!("skyboxes/level-1.png"),

diff --git a/ashen/src/asset/sound/dat/asset_header.rs b/ashen/src/asset/sound/dat/asset_header.rs
@@ -1,5 +1,5 @@
 use crate::{
-    asset::{extension::*, pack_info::PackInfo, AssetParser},
+    asset::{pack_info::PackInfo, AssetParser},
     utils::nom::*,
 };
 
@@ -14,7 +14,7 @@ impl SoundAssetHeader {
     const HEADER: &'static str = "TSND";
 }
 
-impl AssetParser<Wildcard> for SoundAssetHeader {
+impl AssetParser for SoundAssetHeader {
     type Output = Self;
 
     type Context<'ctx> = ();

diff --git a/ashen/src/asset/sound/dat/chunk_header.rs b/ashen/src/asset/sound/dat/chunk_header.rs
@@ -1,13 +1,13 @@
 use crate::{
-    asset::{extension::*, pack_info::PackInfo, AssetParser},
+    asset::{pack_info::PackInfo, AssetParser},
     utils::nom::*,
 };
 
 pub struct SoundChunkHeader {
     pub infos: Vec<PackInfo>,
 }
 
-impl AssetParser<Wildcard> for SoundChunkHeader {
+impl AssetParser for SoundChunkHeader {
     type Output = Self;
 
     type Context<'ctx> = ();

diff --git a/ashen/src/asset/sound/dat/pattern_effect.rs b/ashen/src/asset/sound/dat/pattern_effect.rs
@@ -1,8 +1,5 @@
 use super::{convert_volume, finetune::FineTune};
-use crate::{
-    asset::{extension::*, AssetParser},
-    utils::nom::*,
-};
+use crate::{asset::AssetParser, utils::nom::*};
 
 #[derive(Debug, Clone, Copy)]
 pub enum Speed {
@@ -130,7 +127,7 @@ impl PatternEffect {
     }
 }
 
-impl AssetParser<Wildcard> for Option<PatternEffect> {
+impl AssetParser for Option<PatternEffect> {
     type Output = Self;
 
     type Context<'ctx> = bool;

diff --git a/ashen/src/asset/sound/dat/pattern_event.rs b/ashen/src/asset/sound/dat/pattern_event.rs
@@ -3,10 +3,7 @@ use std::rc::Rc;
 use bitflags::bitflags;
 
 use super::{convert_volume, finetune::FineTune, pattern_effect::PatternEffect, t_instrument::*};
-use crate::{
-    asset::{extension::*, AssetParser},
-    utils::nom::*,
-};
+use crate::{asset::AssetParser, utils::nom::*};
 
 #[derive(Default, PartialEq, Clone, Copy, Debug)]
 pub enum PatternEventNote {
@@ -15,7 +12,7 @@ pub enum PatternEventNote {
     On(FineTune),
 }
 
-impl AssetParser<Wildcard> for Option<PatternEventNote> {
+impl AssetParser for Option<PatternEventNote> {
     type Output = Self;
 
     type Context<'ctx> = bool;
@@ -51,7 +48,7 @@ bitflags! {
     }
 }
 
-impl AssetParser<Wildcard> for PatternEventFlags {
+impl AssetParser for PatternEventFlags {
     type Output = Self;
 
     type Context<'ctx> = ();
@@ -71,7 +68,7 @@ impl AssetParser<Wildcard> for PatternEventFlags {
     }
 }
 
-impl AssetParser<Wildcard> for Option<PatternEventInstrument> {
+impl AssetParser for Option<PatternEventInstrument> {
     type Output = Self;
 
     type Context<'ctx> = (bool, &'ctx [Rc<TInstrument>]);
@@ -105,7 +102,7 @@ impl Default for PatternEventVolume {
     }
 }
 
-impl AssetParser<Wildcard> for Option<PatternEventVolume> {
+impl AssetParser for Option<PatternEventVolume> {
     type Output = Self;
 
     type Context<'ctx> = bool;
@@ -152,7 +149,7 @@ impl PatternEvent {
     }
 }
 
-impl AssetParser<Wildcard> for PatternEvent {
+impl AssetParser for PatternEvent {
     type Output = Self;
 
     type Context<'ctx> = &'ctx [Rc<TInstrument>];