unspeaker/tengri
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tengri.git synced 2025-12-07 04:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dsl: use only Dsl trait

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

85
output/src/ops/transform.rs
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> {