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: dsl, input, output, proc: more precise lifetimes
Some checks are pending
/ build (push) Waiting to run
Details

Browse source
This commit is contained in:
🪞👃🪞 2025-05-09 18:17:10 +03:00
parent 22d63eed9c
commit 5e09f5a4bb
11 changed files with 140 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

11
proc/src/proc_command.rs
View file

@ -68,8 +68,10 @@ impl ToTokens for CommandDef {
}
#block
/// Generated by [tengri_proc].
impl<'a> TryFromDsl<'a, #target> for #enumeration {
fn try_from_expr (state: &#target, iter: TokenIter) -> Option<Self> {
impl<'state> TryFromDsl<'state, #target> for #enumeration {
fn try_from_expr <'source: 'state> (
state: &'state #target, iter: TokenIter<'source>
) -> Option<Self> {
let mut iter = iter.clone();
match iter.next() {
#(#matchers)*
@ -148,11 +150,10 @@ impl CommandArm {
for (arg, ty) in self.args() {
let take_err = LitStr::new(&format!("{}: missing argument \"{}\" ({})",
quote!{#ident}, quote!{#arg}, quote!{#ty}), Span::call_site());
let give_err = LitStr::new(&format!("{}: missing value \"{}\" ({})",
let give_err = LitStr::new(&format!("{}: missing value for \"{}\" ({})",
quote!{#ident}, quote!{#arg}, quote!{#ty}), Span::call_site());
write_quote_to(&mut out, quote! {
#arg : Context::get(state, &iter.next().expect(#take_err).value)
.expect(#give_err) ,
#arg: Context::get(state, &mut iter).expect(#give_err),
});
}
out

16
proc/src/proc_expose.rs
View file

@ -66,8 +66,8 @@ impl ToTokens for ExposeImpl {
let formatted_type = format!("{}", quote! { #t });
let predefined = match formatted_type.as_str() {
"bool" => quote! {
::tengri::dsl::Value::Sym(":true") => true,
::tengri::dsl::Value::Sym(":false") => false,
Some(::tengri::dsl::Value::Sym(":true")) => true,
Some(::tengri::dsl::Value::Sym(":false")) => false,
},
"u8" | "u16" | "u32" | "u64" | "usize" |
"i8" | "i16" | "i32" | "i64" | "isize" => {
@ -76,7 +76,7 @@ impl ToTokens for ExposeImpl {
Span::call_site()
);
quote! {
::tengri::dsl::Value::Num(n) => TryInto::<#t>::try_into(*n)
Some(::tengri::dsl::Value::Num(n)) => TryInto::<#t>::try_into(n)
.unwrap_or_else(|_|panic!(#num_err)),
}
},
@ -85,9 +85,11 @@ impl ToTokens for ExposeImpl {
let values = variants.iter().map(ExposeArm::from);
write_quote_to(out, quote! {
/// Generated by [tengri_proc].
impl ::tengri::dsl::Context<#t> for #target {
fn get (&self, dsl: &::tengri::dsl::Value) -> Option<#t> {
Some(match dsl {
impl<'state> ::tengri::dsl::Context<'state, #t> for #target {
fn get <'source> (
&self, iter: &mut ::tengri::dsl::TokenIter<'source>
) -> Option<#t> {
Some(match iter.next().map(|x|x.value) {
#predefined
#(#values,)*
_ => return None
@ -113,7 +115,7 @@ impl ToTokens for ExposeArm {
let Self(key, value) = self;
let key = LitStr::new(&key, Span::call_site());
write_quote_to(out, quote! {
::tengri::dsl::Value::Sym(#key) => self.#value()
Some(::tengri::dsl::Value::Sym(#key)) => self.#value()
})
}
}

6
proc/src/proc_view.rs
View file

@ -55,8 +55,10 @@ impl ToTokens for ViewDef {
}
}
/// Generated by [tengri_proc].
impl<'a> ::tengri::output::ViewContext<'a, #output> for #ident {
fn get_content_sym (&'a self, value: &Value<'a>) -> Option<RenderBox<'a, #output>> {
impl<'state> ::tengri::output::ViewContext<'state, #output> for #ident {
fn get_content_sym <'source: 'state> (&'state self, value: &Value<'source>)
-> Option<RenderBox<'state, #output>>
{
match value {
#(#exposed)*
_ => panic!("expected Sym(content), got: {value:?}")