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

dsl: reduce number of lifetime arguments
Some checks are pending
/ build (push) Waiting to run
Details

Browse source
This commit is contained in:
🪞👃🪞 2025-05-21 02:50:21 +03:00
parent 2048dd2263
commit 776cea6f1b
9 changed files with 126 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

12
output/src/ops/cond.rs
View file

@ -18,9 +18,9 @@ impl<A, B> Either<A, B> {
}
}
#[cfg(feature = "dsl")]
impl<'source, A, T: Dsl<bool> + Dsl<A>> Namespace<'source, T> for When<A> {
fn take_from <'state> (
state: &'state T,
impl<A, T: Dsl<bool> + Dsl<A>> Namespace<T> for When<A> {
fn take_from <'source> (
state: &T,
token: &mut TokenIter<'source>
) -> Perhaps<Self> {
Ok(if let Some(Token {
@ -56,9 +56,9 @@ impl<E: Output, A: Render<E>> Content<E> for When<A> {
}
}
#[cfg(feature = "dsl")]
impl<'source, A, B, T: Dsl<bool> + Dsl<A> + Dsl<B>> Namespace<'source, T> for Either<A, B> {
fn take_from <'state> (
state: &'state T,
impl<A, B, T: Dsl<bool> + Dsl<A> + Dsl<B>> Namespace<T> for Either<A, B> {
fn take_from <'source> (
state: &T,
token: &mut TokenIter<'source>
) -> Perhaps<Self> {
if let Some(Token { value: Value::Key("either"), .. }) = token.peek() {

44
output/src/ops/transform.rs
View file

@ -33,17 +33,19 @@ macro_rules! transform_xy {
#[inline] pub const fn xy (item: A) -> Self { Self::XY(item) }
}
#[cfg(feature = "dsl")]
impl<'source, A, T: Dsl<A>> Namespace<'source, T> for $Enum<A> {
fn take_from <'state> (state: &'state T, iter: &mut TokenIter<'source>) -> Perhaps<Self> {
if let Some(Token { value: Value::Key(k), .. }) = iter.peek() {
let mut base = iter.clone();
return Ok(Some(match iter.next() {
impl<A, T: Dsl<A>> Namespace<T> for $Enum<A> {
fn take_from <'source> (
state: &T, token: &mut TokenIter<'source>
) -> Perhaps<Self> {
if let Some(Token { value: Value::Key(k), .. }) = token.peek() {
let mut base = token.clone();
return Ok(Some(match token.next() {
Some(Token{value:Value::Key($x),..}) =>
Self::x(state.take_or_fail(iter, "x: no content")?),
Self::x(state.take_or_fail(token, "x: no content")?),
Some(Token{value:Value::Key($y),..}) =>
Self::y(state.take_or_fail(iter, "y: no content")?),
Self::y(state.take_or_fail(token, "y: no content")?),
Some(Token{value:Value::Key($xy),..}) =>
Self::xy(state.take_or_fail(iter, "xy: no content")?),
Self::xy(state.take_or_fail(token, "xy: no content")?),
_ => unreachable!()
}))
}
@ -77,23 +79,25 @@ macro_rules! transform_xy_unit {
#[inline] pub const fn xy (x: U, y: U, item: A) -> Self { Self::XY(x, y, item) }
}
#[cfg(feature = "dsl")]
impl<'source, A, U: Coordinate, T: Dsl<A> + Dsl<U>> Namespace<'source, T> for $Enum<U, A> {
fn take_from <'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() {
impl<A, U: Coordinate, T: Dsl<A> + Dsl<U>> Namespace<T> for $Enum<U, A> {
fn take_from <'source> (
state: &T, token: &mut TokenIter<'source>
) -> Perhaps<Self> {
Ok(if let Some(Token { value: Value::Key($x|$y|$xy), .. }) = token.peek() {
let mut base = token.clone();
Some(match token.next() {
Some(Token { value: Value::Key($x), .. }) => Self::x(
state.take_or_fail(iter, "x: no unit")?,
state.take_or_fail(iter, "x: no content")?,
state.take_or_fail(token, "x: no unit")?,
state.take_or_fail(token, "x: no content")?,
),
Some(Token { value: Value::Key($y), .. }) => Self::y(
state.take_or_fail(iter, "y: no unit")?,
state.take_or_fail(iter, "y: no content")?,
state.take_or_fail(token, "y: no unit")?,
state.take_or_fail(token, "y: no content")?,
),
Some(Token { value: Value::Key($x), .. }) => Self::xy(
state.take_or_fail(iter, "xy: no unit x")?,
state.take_or_fail(iter, "xy: no unit y")?,
state.take_or_fail(iter, "xy: no content")?
state.take_or_fail(token, "xy: no unit x")?,
state.take_or_fail(token, "xy: no unit y")?,
state.take_or_fail(token, "xy: no content")?
),
_ => unreachable!(),
})