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

refactor(dsl): use traits instead of enums
Some checks are pending
/ build (push) Waiting to run
Details

Browse source
This commit is contained in:
🪞👃🪞 2025-07-20 03:19:24 +03:00
parent d72a3b5b8f
commit 73eb935282
6 changed files with 362 additions and 541 deletions
Download patch file Download diff file Expand all files Collapse all files

1
proc/src/proc_command.rs
View file

@ -153,7 +153,6 @@ impl ToTokens for CommandDef {
fn from_dsl (state: &#state, value: &impl ::tengri::dsl::Dsl)
-> Perhaps<Self>
{
use ::tengri::dsl::Val::*;
todo!()//Ok(match token { #(#matchers)* _ => None })
}
}

133
proc/src/proc_expose.rs
View file

@ -67,63 +67,104 @@ impl ToTokens for ExposeImpl {
}
}
fn is_num (t: &impl AsRef<str>) -> bool {
return matches!(t.as_ref(),
| "u8" | "u16" | "u32" | "u64" | "usize"
| "i8" | "i16" | "i32" | "i64" | "isize") }
impl ExposeImpl {
fn expose_variants (
&self, out: &mut TokenStream2, t: &ExposeType, variants: &BTreeMap<String, Ident>
) {
let Self(ItemImpl { self_ty: state, .. }, ..) = self;
let arms = variants.iter().map(|(key, value)|{
let type_is = format!("{}", quote! { #t });
let variants = variants.iter().map(|(key, value)|{
let key = LitStr::new(&key, Span::call_site());
quote! { #key => state.#value(), }
quote! { Some(#key) => Ok(Some(state.#value())), }
});
let arms = Self::with_predefined(t, quote! { #(#arms)* });
write_quote_to(out, quote! {
/// Generated by [tengri_proc::expose].
impl ::tengri::dsl::FromDsl<#state> for #t {
fn from_dsl (state: &#state, dsl: &impl Dsl) -> Perhaps<Self> {
Ok(Some(match dsl.val() {
#arms
_ => { return Ok(None) }
}))
write_quote_to(out, if &type_is == "bool" {
quote! {
/// Generated by [tengri_proc::expose].
impl ::tengri::dsl::FromDsl<#state> for #t {
fn from_dsl (state: &#state, dsl: &impl Dsl) -> Perhaps<Self> {
match dsl.key()? {
Some("true") => Ok(Some(true)),
Some("false") => Ok(Some(false)),
_ => match dsl.sym()? { #(#variants)* _ => Ok(None) }
}
}
}
}
});
}
fn with_predefined (t: &ExposeType, variants: impl ToTokens) -> impl ToTokens {
let formatted_type = format!("{}", quote! { #t });
if &formatted_type == "bool" {
return quote! {
::tengri::dsl::Val::Sym(s) => match s.as_ref() {
":true" => true,
":false" => false,
#variants
_ => { return Ok(None) }
},
} else if is_num(&type_is) {
quote! {
/// Generated by [tengri_proc::expose].
impl ::tengri::dsl::FromDsl<#state> for #t {
fn from_dsl (state: &#state, dsl: &impl Dsl) -> Perhaps<Self> {
match dsl.num()? {
Some(n) => Ok(Some(n.parse::<#t>()?)),
_ => match dsl.sym()? { #(#variants)* _ => Ok(None) }
}
}
}
}
}
if matches!(formatted_type.as_str(),
"u8" | "u16" | "u32" | "u64" | "usize" |
"i8" | "i16" | "i32" | "i64" | "isize")
{
let num_err = LitStr::new(
&format!("{{n}}: failed to convert to {formatted_type}"),
Span::call_site()
);
return quote! {
::tengri::dsl::Val::Num(n) => TryInto::<#t>::try_into(n)
.unwrap_or_else(|_|panic!(#num_err)),
::tengri::dsl::Val::Sym(s) => match s.as_ref() {
#variants
_ => { return Ok(None) }
},
} else {
quote! {
/// Generated by [tengri_proc::expose].
impl ::tengri::dsl::FromDsl<#state> for #t {
fn from_dsl (state: &#state, dsl: &impl Dsl) -> Perhaps<Self> {
match dsl.sym()? { #(#variants)* _ => Ok(None) }
}
}
}
}
return quote! {
::tengri::dsl::Val::Sym(s) => match s.as_ref() {
#variants
_ => { return Ok(None) }
},
}
})
//let arms = variants.iter().map(|(key, value)|{
//let key = LitStr::new(&key, Span::call_site());
//quote! { #key => state.#value(), }
//});
//if &type_is == "bool" {
//return quote! {
//::tengri::dsl::Val::Sym(s) => match s.as_ref() {
//":true" => true,
//":false" => false,
//#variants
//_ => { return Ok(None) }
//},
//}
//}
//if matches!(type_is.as_str(),
//"u8" | "u16" | "u32" | "u64" | "usize" |
//"i8" | "i16" | "i32" | "i64" | "isize")
//{
//let num_err = LitStr::new(
//&format!("{{n}}: failed to convert to {type_is}"),
//Span::call_site()
//);
//return quote! {
//::tengri::dsl::Val::Num(n) => TryInto::<#t>::try_into(n)
//.unwrap_or_else(|_|panic!(#num_err)),
//::tengri::dsl::Val::Sym(s) => match s.as_ref() {
//#variants
//_ => { return Ok(None) }
//},
//}
//}
//let arms = quote! {
//::tengri::dsl::Val::Sym(s) => match s.as_ref() {
//#variants
//_ => { return Ok(None) }
//},
//};
//let builtins =
//write_quote_to(out, quote! {
///// Generated by [tengri_proc::expose].
//impl ::tengri::dsl::FromDsl<#state> for #t {
//fn from_dsl (state: &#state, dsl: &impl Dsl) -> Perhaps<Self> {
//$builtins
//$defined
//Ok(None)
//}
//}
//});
}
}