dsl: use only Dsl trait

This commit is contained in:
🪞👃🪞 2025-05-19 00:06:03 +03:00
parent 3bc739328e
commit 90f5699fff
11 changed files with 430 additions and 406 deletions

View file

@ -36,38 +36,42 @@ pub enum Alignment { #[default] Center, X, Y, NW, N, NE, E, SE, S, SW, W }
pub struct Align<A>(Alignment, A);
#[cfg(feature = "dsl")]
try_from_expr!(<'source, 'state, E>: Align<RenderBox<'state, E>>: |state, iter|{
if let Some(Token { value: Value::Key(key), .. }) = iter.peek() {
match key {
"align/c"|"align/x"|"align/y"|
"align/n"|"align/s"|"align/e"|"align/w"|
"align/nw"|"align/sw"|"align/ne"|"align/se" => {
let _ = iter.next().unwrap();
let content = iter.next().expect("no content specified");
let content = if let Some(content) = state.get_content(&content.value) {
content
} else {
panic!("no content corresponding to {:?}", &content);
};
return Some(match key {
"align/c" => Self::c(content),
"align/x" => Self::x(content),
"align/y" => Self::y(content),
"align/n" => Self::n(content),
"align/s" => Self::s(content),
"align/e" => Self::e(content),
"align/w" => Self::w(content),
"align/nw" => Self::nw(content),
"align/ne" => Self::ne(content),
"align/sw" => Self::sw(content),
"align/se" => Self::se(content),
_ => unreachable!()
})
},
_ => return None
impl<'state, E: Output + 'state, T: ViewContext<'state, E>>
FromDsl<'state, T> for Align<RenderBox<'state, E>> {
fn take_from <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
if let Some(Token { value: Value::Key(key), .. }) = iter.peek() {
match key {
"align/c"|"align/x"|"align/y"|
"align/n"|"align/s"|"align/e"|"align/w"|
"align/nw"|"align/sw"|"align/ne"|"align/se" => {
let _ = iter.next().unwrap();
let content = if let Some(content) = state.get_content(&mut iter.clone())? {
content
} else {
panic!("no content corresponding to {:?}", &iter);
};
return Ok(Some(match key {
"align/c" => Self::c(content),
"align/x" => Self::x(content),
"align/y" => Self::y(content),
"align/n" => Self::n(content),
"align/s" => Self::s(content),
"align/e" => Self::e(content),
"align/w" => Self::w(content),
"align/nw" => Self::nw(content),
"align/ne" => Self::ne(content),
"align/sw" => Self::sw(content),
"align/se" => Self::se(content),
_ => unreachable!()
}))
},
_ => return Ok(None)
}
} else {
Ok(None)
}
}
});
}
impl<A> Align<A> {
#[inline] pub const fn c (a: A) -> Self { Self(Alignment::Center, a) }

View file

@ -21,30 +21,40 @@ impl<E: Output, A: Content<E>, B: Content<E>> Content<E> for Bsp<A, B> {
}
}
#[cfg(feature = "dsl")]
try_from_expr!(<'source, 'state, E>: Bsp<RenderBox<'state, E>, RenderBox<'state, E>>: |state, iter| {
if let Some(Token { value: Value::Key(key), .. }) = iter.peek() {
match key {
"bsp/n"|"bsp/s"|"bsp/e"|"bsp/w"|"bsp/a"|"bsp/b" => {
let original = iter.clone();
let _ = iter.next().unwrap();
let c1 = iter.next().unwrap_or_else(||panic!("no content1 specified: {original:?}"));
let c2 = iter.next().unwrap_or_else(||panic!("no content2 specified: {original:?}"));
let c1 = state.get_content(&c1.value).expect("no content1 provided");
let c2 = state.get_content(&c2.value).expect("no content2 provided");
return Some(match key {
"bsp/n" => Self::n(c1, c2),
"bsp/s" => Self::s(c1, c2),
"bsp/e" => Self::e(c1, c2),
"bsp/w" => Self::w(c1, c2),
"bsp/a" => Self::a(c1, c2),
"bsp/b" => Self::b(c1, c2),
_ => unreachable!(),
})
},
_ => return None
}
impl<'state, E: Output + 'state, T: ViewContext<'state, E>>
FromDsl<'state, T> for Bsp<RenderBox<'state, E>, RenderBox<'state, E>> {
fn take_from <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
Ok(if let Some(Token {
value: Value::Key("bsp/n"|"bsp/s"|"bsp/e"|"bsp/w"|"bsp/a"|"bsp/b"),
..
}) = iter.peek() {
let base = iter.clone();
return Ok(Some(match iter.next() {
Some(Token { value: Value::Key("bsp/n"), .. }) =>
Self::n(state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?),
Some(Token { value: Value::Key("bsp/s"), .. }) =>
Self::s(state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?),
Some(Token { value: Value::Key("bsp/e"), .. }) =>
Self::e(state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?),
Some(Token { value: Value::Key("bsp/w"), .. }) =>
Self::w(state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?),
Some(Token { value: Value::Key("bsp/a"), .. }) =>
Self::a(state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?),
Some(Token { value: Value::Key("bsp/b"), .. }) =>
Self::b(state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?),
_ => unreachable!(),
}))
} else {
None
})
}
});
}
impl<A, B> Bsp<A, B> {
#[inline] pub const fn n (a: A, b: B) -> Self { Self(North, a, b) }
#[inline] pub const fn s (a: A, b: B) -> Self { Self(South, a, b) }

View file

@ -19,35 +19,41 @@ impl<A, B> Either<A, B> {
}
#[cfg(feature = "dsl")]
try_from_expr!(<'source, 'state, E>: When<RenderBox<'state, E>>: |state, iter| {
if let Some(Token { value: Value::Key("when"), .. }) = iter.peek() {
let _ = iter.next().unwrap();
let content = iter.next().expect("no content specified").value;
return Some(Self(
state.get(&mut iter)
.unwrap_or_else(||panic!("cond: no condition: {iter:?}")),
state.get_content(&content)
.unwrap_or_else(||panic!("cond: no content for {:?}: {iter:?}", &content))
))
impl<'state, E: Output + 'state, T: ViewContext<'state, E>>
FromDsl<'state, T> for When<RenderBox<'state, E>> {
fn take_from <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
Ok(if let Some(Token {
value: Value::Key("when"),
..
}) = iter.peek() {
let base = iter.clone();
return Ok(Some(Self(
state.take(iter)?.unwrap_or_else(||panic!("cond: no condition: {base:?}")),
state.get_content_or_fail(iter)?
)))
} else {
None
})
}
});
}
#[cfg(feature = "dsl")]
try_from_expr!(<'source, 'state, E>: Either<RenderBox<'state, E>, RenderBox<'state, E>>: |state, iter| {
if let Some(Token { value: Value::Key("either"), .. }) = iter.peek() {
let base = iter.clone();
let _ = iter.next().unwrap();
//panic!("{iter:?}");
return Some(Self(
state.get(&mut iter)
.unwrap_or_else(||panic!("either: no condition: {base:?}")),
state.get_content(&iter.next().expect("no content specified").value)
.unwrap_or_else(||panic!("either: no content 1: {base:?}")),
state.get_content(&iter.next().expect("no alternate specified").value)
.unwrap_or_else(||panic!("either: no content 2: {base:?}")),
))
impl<'state, E: Output + 'state, T: ViewContext<'state, E>>
FromDsl<'state, T> for Either<RenderBox<'state, E>, RenderBox<'state, E>> {
fn take_from <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
if let Some(Token { value: Value::Key("either"), .. }) = iter.peek() {
let base = iter.clone();
let _ = iter.next().unwrap();
//panic!("{iter:?}");
return Ok(Some(Self(
state.take(iter)?.unwrap_or_else(||panic!("either: no condition: {base:?}")),
state.get_content_or_fail(iter)?,
state.get_content_or_fail(iter)?,
)))
}
Ok(None)
}
});
}
impl<E: Output, A: Render<E>> Content<E> for When<A> {
fn layout (&self, to: E::Area) -> E::Area {

View file

@ -39,30 +39,22 @@ macro_rules! transform_xy {
}
}
#[cfg(feature = "dsl")]
impl<'state, E: Output + 'state, T: ViewContext<'state, E>> TryFromDsl<'state, T>
for $Enum<RenderBox<'state, E>> {
fn try_from_expr <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>)
-> Option<Self>
{
let mut iter = iter.clone();
impl<'state, E: Output + 'state, T: ViewContext<'state, E>>
FromDsl<'state, T> for $Enum<RenderBox<'state, E>> {
fn take_from <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
if k == $x || k == $y || k == $xy {
let _ = iter.next().unwrap();
let token = iter.next().expect("no content specified");
let content = if let Some(content) = state.get_content(&token.value) {
content
} else {
panic!("no content corresponding to {:?}", &token.value);
};
return Some(match k {
$x => Self::x(content),
$y => Self::y(content),
$xy => Self::xy(content),
_ => unreachable!()
})
}
let mut base = iter.clone();
return Ok(Some(match iter.next() {
Some(Token{value:Value::Key($x),..}) =>
Self::x(state.get_content_or_fail(iter)?),
Some(Token{value:Value::Key($y),..}) =>
Self::y(state.get_content_or_fail(iter)?),
Some(Token{value:Value::Key($xy),..}) =>
Self::xy(state.get_content_or_fail(iter)?),
_ => unreachable!()
}))
}
None
Ok(None)
}
}
impl<E: Output, T: Content<E>> Content<E> for $Enum<T> {
@ -92,31 +84,30 @@ macro_rules! transform_xy_unit {
#[inline] pub const fn xy (x: U, y: U, item: T) -> Self { Self::XY(x, y, item) }
}
#[cfg(feature = "dsl")]
impl<'state, E: Output + 'state, T: ViewContext<'state, E>> TryFromDsl<'state, T>
for $Enum<E::Unit, RenderBox<'state, E>> {
fn try_from_expr <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Option<Self> {
let mut iter = iter.clone();
if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
if k == $x || k == $y {
let _ = iter.next().unwrap();
let u = state.get(&mut iter).expect("no unit specified");
let c = state.get_content(&iter.next().expect("no content specified").value)
.expect("no content provided");
return Some(match k {
$x => Self::x(u, c),
$y => Self::y(u, c),
_ => unreachable!(),
})
} else if k == $xy {
let _ = iter.next().unwrap();
let u = state.get(&mut iter).expect("no unit specified");
let v = state.get(&mut iter).expect("no unit specified");
let c = state.get_content(&iter.next().expect("no content specified").value)
.expect("no content provided");
return Some(Self::xy(u, v, c))
}
}
None
impl<'state, E: Output + 'state, T: ViewContext<'state, E>>
FromDsl<'state, T> for $Enum<E::Unit, RenderBox<'state, E>> {
fn take_from <'source: 'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
Ok(if let Some(Token { value: Value::Key($x|$y|$xy), .. }) = iter.peek() {
let mut base = iter.clone();
Some(match iter.next() {
Some(Token { value: Value::Key($x), .. }) => Self::x(
state.take_or_fail(iter, "no unit specified")?,
state.get_content_or_fail(iter)?,
),
Some(Token { value: Value::Key($y), .. }) => Self::y(
state.take_or_fail(iter, "no unit specified")?,
state.get_content_or_fail(iter)?,
),
Some(Token { value: Value::Key($x), .. }) => Self::xy(
state.take_or_fail(iter, "no unit specified")?,
state.take_or_fail(iter, "no unit specified")?,
state.get_content_or_fail(iter)?
),
_ => unreachable!(),
})
} else {
None
})
}
}
impl<E: Output, T: Content<E>> Content<E> for $Enum<E::Unit, T> {

View file

@ -8,15 +8,15 @@ use crate::*;
fn content (&$self) -> impl Render<$Output> { $expr }
}
impl<'a> ViewContext<'a, $Output> for $State {
fn get_content_sym (&'a $self, value: &Value<'a>) -> Option<RenderBox<'a, $Output>> {
if let Value::Sym(s) = value {
fn get_content_sym (&'a $self, iter: &Value<'a>) -> Perhaps<RenderBox<'a, $Output>> {
Ok(if let Value::Sym(s) = value {
match *s {
$($sym => Some($body.boxed()),)*
_ => None
}
} else {
panic!("expected content, got: {value:?}")
}
return Err(format!("expected content, got: {iter:?}").into())
})
}
}
}
@ -34,9 +34,11 @@ pub struct View<'a, T>(
impl<'a, O: Output + 'a, T: ViewContext<'a, O>> Content<O> for View<'a, T> {
fn content (&self) -> impl Render<O> {
let mut iter = self.1.clone();
while let Some(Token { value, .. }) = iter.next() {
if let Some(content) = self.0.get_content(&value) {
while let Some(Token { value, .. }) = iter.peek() {
if let Ok(Some(content)) = self.0.get_content(&mut iter) {
return Some(content)
// TODO handle errors here, how?
// error receiver trait in viewcontext?
}
}
return None
@ -46,69 +48,61 @@ impl<'a, O: Output + 'a, T: ViewContext<'a, O>> Content<O> for View<'a, T> {
// Provides components to the view.
#[cfg(feature = "dsl")]
pub trait ViewContext<'state, E: Output + 'state>: Send + Sync
+ Context<'state, bool>
+ Context<'state, usize>
+ Context<'state, E::Unit>
+ Dsl<bool>
+ Dsl<usize>
+ Dsl<E::Unit>
{
fn get_content <'source: 'state> (&'state self, value: &Value<'source>) -> Option<RenderBox<'state, E>> {
match value {
Value::Sym(_) => self.get_content_sym(value),
Value::Exp(_, _) => self.get_content_exp(value),
_ => panic!("only :symbols and (expressions) accepted here, got: {value:?}")
fn get_content_or_fail <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
-> Usually<RenderBox<'state, E>>
{
let base = iter.clone();
if let Some(content) = self.get_content(iter)? {
Ok(content)
} else {
Err(format!("not found: {iter:?}").into())
}
}
fn get_content_sym <'source: 'state> (&'state self, value: &Value<'source>)
-> Option<RenderBox<'state, E>>;
fn get_content_exp <'source: 'state> (&'state self, value: &Value<'source>)
-> Option<RenderBox<'state, E>>
fn get_content <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
-> Perhaps<RenderBox<'state, E>>
{
try_delegate!(self, *value, When::<RenderBox<'state, E>>);
try_delegate!(self, *value, Either::<RenderBox<'state, E>, RenderBox<'state, E>>);
try_delegate!(self, *value, Align::<RenderBox<'state, E>>);
try_delegate!(self, *value, Bsp::<RenderBox<'state, E>, RenderBox<'state, E>>);
try_delegate!(self, *value, Fill::<RenderBox<'state, E>>);
try_delegate!(self, *value, Fixed::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Min::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Max::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Shrink::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Expand::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Push::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Pull::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Margin::<_, RenderBox<'state, E>>);
try_delegate!(self, *value, Padding::<_, RenderBox<'state, E>>);
None
match iter.peek() {
Some(Token { value: Value::Sym(_), .. }) =>
self.get_content_sym(iter),
Some(Token { value: Value::Exp(_, _), .. }) =>
self.get_content_exp(iter),
None => Ok(None),
_ => panic!("only :symbols and (expressions) accepted here")
}
}
fn get_content_sym <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
-> Perhaps<RenderBox<'state, E>>;
fn get_content_exp <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
-> Perhaps<RenderBox<'state, E>>
{
try_delegate!(self, iter, When::<RenderBox<'state, E>>);
try_delegate!(self, iter, Either::<RenderBox<'state, E>, RenderBox<'state, E>>);
try_delegate!(self, iter, Align::<RenderBox<'state, E>>);
try_delegate!(self, iter, Bsp::<RenderBox<'state, E>, RenderBox<'state, E>>);
try_delegate!(self, iter, Fill::<RenderBox<'state, E>>);
try_delegate!(self, iter, Fixed::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Min::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Max::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Shrink::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Expand::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Push::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Pull::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Margin::<_, RenderBox<'state, E>>);
try_delegate!(self, iter, Padding::<_, RenderBox<'state, E>>);
Ok(None)
}
}
#[cfg(feature = "dsl")]
#[macro_export] macro_rules! try_delegate {
($s:ident, $dsl:expr, $T:ty) => {
if let Some(value) = <$T>::try_from_atom($s, $dsl) {
return Some(value.boxed())
}
}
}
#[cfg(feature = "dsl")]
#[macro_export] macro_rules! try_from_expr {
(<
$lt_source:lifetime,
$lt_state:lifetime,
$Output:ident
>: $Struct:ty: |$state:ident, $iter:ident|$body:expr) => {
impl<
$lt_state,
$Output: Output + $lt_state,
T: ViewContext<$lt_state, $Output>
> TryFromDsl<$lt_state, T> for $Struct {
fn try_from_expr <$lt_source: $lt_state> (
$state: &$lt_state T,
$iter: &mut TokenIter<$lt_source>
) -> Option<Self> {
let mut $iter = $iter.clone();
$body;
None
}
let value: Option<$T> = FromDsl::take_from($s, $dsl)?;
if let Some(value) = value {
return Ok(Some(value.boxed()))
}
}
}