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

read explicit lifetime to FromDsl
Some checks are pending
/ build (push) Waiting to run
Details

Browse source
This commit is contained in:
🪞👃🪞 2025-05-20 22:02:51 +03:00
parent 7c1cddc759
commit 455d6d00d5
14 changed files with 252 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

170
proc/src/proc_view.rs
View file

@ -14,8 +14,6 @@ pub(crate) struct ViewImpl {
exposed: BTreeMap<String, Ident>,
}
struct ViewArm(String, Ident);
impl Parse for ViewMeta {
fn parse (input: ParseStream) -> Result<Self> {
Ok(Self {
@ -41,6 +39,60 @@ impl Parse for ViewImpl {
}
}
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(|(key, value)|{
available.push(key.clone());
write_quote(quote! { #key => Some(state.#value().boxed()), })
}).collect();
let available: String = available.join(", ");
let error_msg = LitStr::new(
&format!("expected Sym(content), got: {{token:?}}, available: {available}"),
Span::call_site()
);
write_quote_to(out, 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].
///
/// Gives [#view] the ability to construct the [Render]able
/// which might corresponds to a given [TokenStream],
/// while taking [#view]'s state into consideration.
impl<'source> ::tengri::dsl::FromDsl<'source, #view> for Box<dyn Render<#output> + 'source> {
fn take_from <'state> (
state: &'state #view,
words: &mut ::tengri::dsl::TokenIter<'source>,
) -> Perhaps<Self> {
Ok(words.peek().and_then(|::tengri::dsl::Token{ value, .. }|match value {
::tengri::dsl::Value::Exp(_, exp) => {
todo!("builtin layout ops");
//#builtins
None
},
::tengri::dsl::Value::Sym(sym) => match sym {
#(#exposed)*
_ => None
},
_ => None
}))
}
}
})
}
}
fn builtins () -> [TokenStream2;14] {
[
quote! { When::<A> },
@ -59,117 +111,3 @@ fn builtins () -> [TokenStream2;14] {
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 available: String = available.join(", ");
let error_msg = LitStr::new(
&format!("expected Sym(content), got: {{token:?}}, available: {available}"),
Span::call_site()
);
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].
///
/// 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 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()))
}
//#builtins
None
},
#(#exposed)*
_ => None
})
}
}
} {
out.append(token)
}
}
}
impl ToTokens for ViewArm {
fn to_tokens (&self, out: &mut TokenStream2) {
let Self(key, value) = self;
out.append(Ident::new("Some", Span::call_site()));
out.append(Group::new(Delimiter::Parenthesis, {
let mut out = TokenStream2::new();
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("tengri", Span::call_site()));
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("dsl", Span::call_site()));
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("Token", Span::call_site()));
out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new();
out.append(Ident::new("value", Span::call_site()));
out.append(Punct::new(':', Alone));
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("tengri", Span::call_site()));
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("dsl", Span::call_site()));
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("Value", Span::call_site()));
out.append(Punct::new(':', Joint));
out.append(Punct::new(':', Alone));
out.append(Ident::new("Sym", Span::call_site()));
out.append(Group::new(Delimiter::Parenthesis, {
let mut out = TokenStream2::new();
out.append(LitStr::new(key, Span::call_site()).token());
out
}));
out.append(Punct::new(',', Alone));
out.append(Punct::new('.', Joint));
out.append(Punct::new('.', Alone));
out
}));
out
}));
out.append(Punct::new('=', Joint));
out.append(Punct::new('>', Alone));
out.append(Ident::new("Some", Span::call_site()));
out.append(Group::new(Delimiter::Parenthesis, {
let mut out = TokenStream2::new();
out.append(Ident::new("state", Span::call_site()));
out.append(Punct::new('.', Alone));
out.append(value.clone());
out.append(Group::new(Delimiter::Parenthesis, TokenStream2::new()));
out.append(Punct::new('.', Alone));
out.append(Ident::new("boxed", Span::call_site()));
out.append(Group::new(Delimiter::Parenthesis, TokenStream2::new()));
out
}));
out.append(Punct::new(',', Alone));
}
}