EdnViewData has to go?

This commit is contained in:
🪞👃🪞 2025-01-14 00:24:48 +01:00
parent ddcb967a2c
commit 585bba6666
6 changed files with 25 additions and 25 deletions

View file

@ -1,29 +1,21 @@
use crate::*;
/// Implement `EdnProvide` for a type and context
#[macro_export] macro_rules! edn_provide {
($lt:lifetime: $type:ty:|$self:ident:$State:ty|{ $($pat:pat => $expr:expr),* $(,)? }) => {
impl<$lt> EdnProvide<$lt, $type> for $State {
fn get <S: AsRef<str>> (&$lt $self, edn: &$lt EdnItem<S>) -> Option<$type> {
Some(match edn.to_ref() {
$(EdnItem::Sym($pat) => $expr),*,
_ => return None
})
Some(match edn.to_ref() { $(EdnItem::Sym($pat) => $expr),*, _ => return None })
}
}
};
($type:ty:|$self:ident:$State:ty|{ $($pat:pat => $expr:expr),* $(,)? }) => {
impl<'a> EdnProvide<'a, $type> for $State {
fn get <S: AsRef<str>> (&'a $self, edn: &'a EdnItem<S>) -> Option<$type> {
Some(match edn.to_ref() {
$(EdnItem::Sym($pat) => $expr),*,
_ => return None
})
Some(match edn.to_ref() { $(EdnItem::Sym($pat) => $expr),*, _ => return None })
}
}
};
}
/// Map EDN tokens to parameters of a given type for a given context
pub trait EdnProvide<'a, U>: Sized {
fn get <S: AsRef<str>> (&'a self, _edn: &'a EdnItem<S>) -> Option<U> {
@ -33,7 +25,6 @@ pub trait EdnProvide<'a, U>: Sized {
self.get(edn).expect("no value")
}
}
impl<'a, T: EdnProvide<'a, U>, U> EdnProvide<'a, U> for &T {
fn get <S: AsRef<str>> (&'a self, edn: &'a EdnItem<S>) -> Option<U> {
(*self).get(edn)
@ -42,3 +33,11 @@ impl<'a, T: EdnProvide<'a, U>, U> EdnProvide<'a, U> for &T {
(*self).get_or_fail(edn)
}
}
impl<'a, T: EdnProvide<'a, U>, U> EdnProvide<'a, U> for Option<T> {
fn get <S: AsRef<str>> (&'a self, edn: &'a EdnItem<S>) -> Option<U> {
self.as_ref().map(|s|s.get(edn)).flatten()
}
fn get_or_fail <S: AsRef<str>> (&'a self, edn: &'a EdnItem<S>) -> U {
self.as_ref().map(|s|s.get_or_fail(edn)).expect("no provider")
}
}