diff options
| -rw-r--r-- | mingling/src/parser/picker.rs | 16 | ||||
| -rw-r--r-- | mingling_core/src/asset/enum_tag.rs | 4 | ||||
| -rw-r--r-- | mingling_macros/src/enum_tag.rs | 9 |
3 files changed, 24 insertions, 5 deletions
diff --git a/mingling/src/parser/picker.rs b/mingling/src/parser/picker.rs index c6c2beb..9258002 100644 --- a/mingling/src/parser/picker.rs +++ b/mingling/src/parser/picker.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use crate::parser::Argument; -use mingling_core::Flag; +use mingling_core::{EnumTag, Flag}; #[doc(hidden)] pub mod builtin; @@ -316,3 +316,17 @@ impl_pick_structs! { Pick8 Pick9 val_9 T1 val_1, T2 val_2, T3 val_3, T4 val_4, T impl_pick_structs! { Pick9 Pick10 val_10 T1 val_1, T2 val_2, T3 val_3, T4 val_4, T5 val_5, T6 val_6, T7 val_7, T8 val_8, T9 val_9 } impl_pick_structs! { Pick10 Pick11 val_11 T1 val_1, T2 val_2, T3 val_3, T4 val_4, T5 val_5, T6 val_6, T7 val_7, T8 val_8, T9 val_9, T10 val_10 } impl_pick_structs! { Pick11 Pick12 val_12 T1 val_1, T2 val_2, T3 val_3, T4 val_4, T5 val_5, T6 val_6, T7 val_7, T8 val_8, T9 val_9, T10 val_10, T11 val_11 } + +pub trait PickableEnum: EnumTag + Default {} + +impl<T> Pickable for T +where + T: PickableEnum, +{ + type Output = T; + + fn pick(args: &mut Argument, flag: Flag) -> Option<Self::Output> { + let name = args.pick_argument(flag)?; + T::build_enum(name) + } +} diff --git a/mingling_core/src/asset/enum_tag.rs b/mingling_core/src/asset/enum_tag.rs index 563d826..28428a6 100644 --- a/mingling_core/src/asset/enum_tag.rs +++ b/mingling_core/src/asset/enum_tag.rs @@ -7,5 +7,7 @@ pub trait EnumTag { fn enums() -> &'static [(&'static str, &'static str)]; /// Build the enum from a name - fn build_enum(name: String) -> Self; + fn build_enum(name: String) -> Option<Self> + where + Self: Sized; } diff --git a/mingling_macros/src/enum_tag.rs b/mingling_macros/src/enum_tag.rs index a30a0d5..497bc88 100644 --- a/mingling_macros/src/enum_tag.rs +++ b/mingling_macros/src/enum_tag.rs @@ -70,10 +70,13 @@ fn derive_enum_tag_impl(input: DeriveInput) -> Result<proc_macro2::TokenStream> } } - fn build_enum(name: String) -> Self { + fn build_enum(name: String) -> Option<Self> + where + Self: Sized + { match name.as_str() { #(#build_match_arms)* - _ => panic!("Invalid enum variant name: {}", name), + _ => None, } } @@ -128,7 +131,7 @@ fn process_variant( }); build_match_arms.push(quote! { - #variant_name_str => #enum_name::#variant_name, + #variant_name_str => Some(#enum_name::#variant_name), }); Ok(()) |