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

getting there with the iters but still wrong

Browse source
This commit is contained in:
🪞👃🪞 2025-01-19 00:29:51 +01:00
parent 323afe4c89
commit 266f59085e
3 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
output/src/op_align.rs
View file

@ -2,7 +2,7 @@ use crate::*;
#[derive(Debug, Copy, Clone, Default)] pub enum Alignment { #[default] Center, X, Y, NW, N, NE, E, SE, S, SW, W } #[derive(Debug, Copy, Clone, Default)] pub enum Alignment { #[default] Center, X, Y, NW, N, NE, E, SE, S, SW, W }
pub struct Align<A>(Alignment, A); pub struct Align<A>(Alignment, A);
try_from_expr!(<'a, E>: Align<RenderBox<'a, E>>: |state, iter| { try_from_expr!(<'a, E>: Align<RenderBox<'a, E>>: |state, iter| {
if let Some((Token { value: Value::Key(key), .. }, _)) = iter.next() { if let Some((Token { value: Value::Key(key), .. }, iter)) = iter.next() {
match key { match key {
"align/c" => return Some(Self::c(state.get_content(&iter.next()?.0.value).expect("no content"))), "align/c" => return Some(Self::c(state.get_content(&iter.next()?.0.value).expect("no content"))),
"align/x" => return Some(Self::x(state.get_content(&iter.next()?.0.value).expect("no content"))), "align/x" => return Some(Self::x(state.get_content(&iter.next()?.0.value).expect("no content"))),
@ -15,7 +15,7 @@ try_from_expr!(<'a, E>: Align<RenderBox<'a, E>>: |state, iter| {
"align/ne" => return Some(Self::ne(state.get_content(&iter.next()?.0.value).expect("no content"))), "align/ne" => return Some(Self::ne(state.get_content(&iter.next()?.0.value).expect("no content"))),
"align/sw" => return Some(Self::sw(state.get_content(&iter.next()?.0.value).expect("no content"))), "align/sw" => return Some(Self::sw(state.get_content(&iter.next()?.0.value).expect("no content"))),
"align/se" => return Some(Self::se(state.get_content(&iter.next()?.0.value).expect("no content"))), "align/se" => return Some(Self::se(state.get_content(&iter.next()?.0.value).expect("no content"))),
_ => {} _ => return None
} }
} }
}); });

57
output/src/op_bsp.rs
View file

@ -32,36 +32,33 @@ impl<E: Output, A: Content<E>, B: Content<E>> Content<E> for Bsp<A, B> {
} }
} }
try_from_expr!(<'a, E>: Bsp<RenderBox<'a, E>, RenderBox<'a, E>>: |state, iter| { try_from_expr!(<'a, E>: Bsp<RenderBox<'a, E>, RenderBox<'a, E>>: |state, iter| {
if let Some(Token { value: Value::Key(key), .. }) = iter.peek() { Some(if let Some((Token { value: Value::Key("bsp/n"), .. }, iter)) = iter.next() {
let iter = iter.clone().next().unwrap().1; let (s, iter) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no south provided"), iter)).expect("no south specified");
match key { let (n, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no north provided"), iter)).expect("no north specified");
"bsp/n" => return Some(Self::n( Self::n(s, n)
state.get_content(&iter.next()?.0.value).expect("no south"), } else if let Some((Token { value: Value::Key("bsp/s"), .. }, iter)) = iter.next() {
state.get_content(&iter.next()?.0.value).expect("no north") let (n, iter) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no north provided"), iter)).expect("no north specified");
)), let (s, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no south provided"), iter)).expect("no south specified");
"bsp/s" => return Some(Self::s( Self::s(n, s)
state.get_content(&iter.next()?.0.value).expect("no north"), } else if let Some((Token { value: Value::Key("bsp/e"), .. }, iter)) = iter.next() {
state.get_content(&iter.next()?.0.value).expect("no south") let (w, iter) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no west provided"), iter)).expect("no west specified");
)), let (e, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no east provided"), iter)).expect("no east specified");
"bsp/e" => return Some(Self::e( Self::e(w, e)
state.get_content(&iter.next()?.0.value).expect("no west"), } else if let Some((Token { value: Value::Key("bsp/w"), .. }, iter)) = iter.next() {
state.get_content(&iter.next()?.0.value).expect("no east") let (e, iter) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no west provided"), iter)).expect("no west specified");
)), let (w, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no east provided"), iter)).expect("no east specified");
"bsp/w" => return Some(Self::w( Self::w(e, w)
state.get_content(&iter.next()?.0.value).expect("no east"), } else if let Some((Token { value: Value::Key("bsp/a"), .. }, iter)) = iter.next() {
state.get_content(&iter.next()?.0.value).expect("no west") let (a, iter) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no above provided"), iter)).expect("no above specified");
)), let (b, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no below provided"), iter)).expect("no below specified");
"bsp/a" => return Some(Self::a( Self::a(a, b)
state.get_content(&iter.next()?.0.value).expect("no above"), } else if let Some((Token { value: Value::Key("bsp/b"), .. }, iter)) = iter.next() {
state.get_content(&iter.next()?.0.value).expect("no below") let (a, iter) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no above provided"), iter)).expect("no above specified");
)), let (b, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no below provided"), iter)).expect("no below specified");
"bsp/b" => return Some(Self::b( Self::b(a, b)
state.get_content(&iter.next()?.0.value).expect("no above"), } else {
state.get_content(&iter.next()?.0.value).expect("no below") return None
)), })
_ => {}
}
}
}); });
impl<A, B> Bsp<A, B> { impl<A, B> Bsp<A, B> {
pub fn n (a: A, b: B) -> Self { Self(North, a, b) } pub fn n (a: A, b: B) -> Self { Self(North, a, b) }

6
output/src/op_transform.rs
View file

@ -55,16 +55,16 @@ macro_rules! transform_xy_unit {
fn try_from_expr (state: &'a T, iter: TokenIter<'a>) -> Option<Self> { fn try_from_expr (state: &'a T, iter: TokenIter<'a>) -> Option<Self> {
Some(if let Some((Token { value: Value::Key($x), .. }, iter)) = iter.next() { Some(if let Some((Token { value: Value::Key($x), .. }, iter)) = iter.next() {
let (x, iter) = iter.next().map(|(x, iter)|(state.get(&x.value).expect("no x provided"), iter)).expect("no x specified"); let (x, iter) = iter.next().map(|(x, iter)|(state.get(&x.value).expect("no x provided"), iter)).expect("no x specified");
let (c, _) = iter.next().map(|(x, iter)|(state.get_content(&x.value).expect("no content provided"), iter)).expect("no content specified"); let (c, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no content provided"), iter)).expect("no content specified");
Self::x(x, c) Self::x(x, c)
} else if let Some((Token { value: Value::Key($y), .. }, iter)) = iter.next() { } else if let Some((Token { value: Value::Key($y), .. }, iter)) = iter.next() {
let (y, iter) = iter.next().map(|(y, iter)|(state.get(&y.value).expect("no y provided"), iter)).expect("no y specified"); let (y, iter) = iter.next().map(|(y, iter)|(state.get(&y.value).expect("no y provided"), iter)).expect("no y specified");
let (c, _) = iter.next().map(|(x, iter)|(state.get_content(&x.value).expect("no content provided"), iter)).expect("no content specified"); let (c, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no content provided"), iter)).expect("no content specified");
Self::y(y, c) Self::y(y, c)
} else if let Some((Token { value: Value::Key($xy), .. }, iter)) = iter.next() { } else if let Some((Token { value: Value::Key($xy), .. }, iter)) = iter.next() {
let (x, iter) = iter.next().map(|(x, iter)|(state.get(&x.value).expect("no x provided"), iter)).expect("no x specified"); let (x, iter) = iter.next().map(|(x, iter)|(state.get(&x.value).expect("no x provided"), iter)).expect("no x specified");
let (y, iter) = iter.next().map(|(y, iter)|(state.get(&y.value).expect("no y provided"), iter)).expect("no y specified"); let (y, iter) = iter.next().map(|(y, iter)|(state.get(&y.value).expect("no y provided"), iter)).expect("no y specified");
let (c, _) = iter.next().map(|(x, iter)|(state.get_content(&x.value).expect("no content provided"), iter)).expect("no content specified"); let (c, _) = iter.next().map(|(c, iter)|(state.get_content(&c.value).expect("no content provided"), iter)).expect("no content specified");
Self::xy(x, y, c) Self::xy(x, y, c)
} else { } else {
return None return None