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

wip: directionalize!

Browse source 
can't fit all into 1 trait because of directionality
of trait implementation rules and constraints :(
This commit is contained in:
🪞👃🪞 2025-05-20 18:48:55 +03:00
parent f797a7143d
commit 7c1cddc759
10 changed files with 221 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

11
proc/src/proc_command.rs
View file

@ -144,12 +144,11 @@ impl ToTokens for CommandDef {
}
}
/// Generated by [tengri_proc].
impl ::tengri::dsl::Dsl<#command_enum> for #state {
fn take <'source, 'state> (
&'state self, words: &mut TokenIter<'source>
)
-> ::tengri::Perhaps<#command_enum>
{
impl ::tengri::dsl::FromDsl<#state> for #command_enum {
fn take_from <'state, 'source: 'state> (
state: &'state #state,
words: &mut TokenIter<'source>,
) -> Perhaps<Self> {
let mut words = words.clone();
let token = words.next();
todo!()//Ok(match token { #(#matchers)* _ => None })

13
proc/src/proc_expose.rs
View file

@ -60,7 +60,7 @@ impl ToTokens for ExposeDef {
impl ToTokens for ExposeImpl {
fn to_tokens (&self, out: &mut TokenStream2) {
let Self(block, exposed) = self;
let target = &block.self_ty;
let exposed_impl_type = &block.self_ty;
write_quote_to(out, quote! { #block });
for (t, variants) in exposed.iter() {
let formatted_type = format!("{}", quote! { #t });
@ -84,12 +84,13 @@ impl ToTokens for ExposeImpl {
};
let values = variants.iter().map(ExposeArm::from);
write_quote_to(out, quote! {
/// Generated by [tengri_proc].
impl ::tengri::dsl::Dsl<#t> for #target {
fn take <'state, 'source> (
&'state self, iter: &mut ::tengri::dsl::TokenIter<'source>
/// Generated by [tengriproc].
impl ::tengri::dsl::Dsl<#t> for #exposed_impl_type {
fn take <'state, 'source: 'state> (
&'state self,
words: &mut ::tengri::dsl::TokenIter<'source>
) -> Perhaps<#t> {
Ok(Some(match iter.next().map(|x|x.value) {
Ok(Some(match words.next().map(|x|x.value) {
#predefined
#(#values,)*
_ => return Ok(None)

69
proc/src/proc_view.rs
View file

@ -41,15 +41,33 @@ impl Parse for ViewImpl {
}
}
fn builtins () -> [TokenStream2;14] {
[
quote! { When::<A> },
quote! { Either::<A, B> },
quote! { Align::<A> },
quote! { Bsp::<A, B> },
quote! { Fill::<A> },
quote! { Fixed::<_, A> },
quote! { Min::<_, A> },
quote! { Max::<_, A> },
quote! { Shrink::<_, A> },
quote! { Expand::<_, A> },
quote! { Push::<_, A> },
quote! { Pull::<_, A> },
quote! { Margin::<_, A> },
quote! { Padding::<_, A> },
]
}
impl ToTokens for ViewDef {
fn to_tokens (&self, out: &mut TokenStream2) {
let Self(ViewMeta { output }, ViewImpl { block, exposed }) = self;
let view = &block.self_ty;
let mut available = vec![];
let exposed: Vec<_> = exposed.iter().map(|(k,v)|{
available.push(k.clone());
ViewArm(k.clone(), v.clone())
}).collect();
let exposed: Vec<_> = exposed.iter()
.map(|(k,v)|{ available.push(k.clone()); ViewArm(k.clone(), v.clone()) })
.collect();
let available: String = available.join(", ");
let error_msg = LitStr::new(
&format!("expected Sym(content), got: {{token:?}}, available: {available}"),
@ -58,43 +76,33 @@ impl ToTokens for ViewDef {
for token in quote! {
#block
/// Generated by [tengri_proc].
///
/// Delegates the rendering of [#view] to the [#view::view} method,
/// which you will need to implement, e.g. passing a [TokenIter]
/// containing a layout and keybindings config from user dirs.
impl ::tengri::output::Content<#output> for #view {
fn content (&self) -> impl Render<#output> {
self.view()
}
}
/// Generated by [tengri_proc].
impl<'state> ::tengri::dsl::FromDsl<'state, #view>
for ::tengri::output::RenderBox<'state, #output> {
fn take_from <'source: 'state> (
state: &'state #view,
token: &mut ::tengri::dsl::TokenIter<'source>
///
/// Gives [#view] the ability to construct the [Render]able
/// which might corresponds to a given [TokenStream],
/// while taking [#view]'s state into consideration.
impl<'context> ::tengri::dsl::FromDsl<#view> for RenderBox<'context, #output> {
fn take_from <'state, 'source: 'state> (
state: &'state #view, words: &mut ::tengri::dsl::TokenIter<'source>
) -> Perhaps<Self> {
Ok(match token.peek() {
Some(::tengri::dsl::Token {
::tengri::dsl::value: Value::Exp(exp), ..
}) => {
let value: Option<$T> = FromDsl::take_from($s, $dsl)?;
if let Some(value) = value {
Ok(match words.peek() {
Some(::tengri::dsl::Token { value: ::tengri::dsl::Value::Exp(exp), .. }) => {
if let Some(value) = FromDsl::take_from(state, words)? {
return Ok(Some(value.boxed()))
}
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>>);
//#builtins
None
},
#(#exposed),*
#(#exposed)*
_ => None
})
}
@ -162,5 +170,6 @@ impl ToTokens for ViewArm {
out.append(Group::new(Delimiter::Parenthesis, TokenStream2::new()));
out
}));
out.append(Punct::new(',', Alone));
}
}