dsl: use only Dsl trait

This commit is contained in:
🪞👃🪞 2025-05-19 00:06:03 +03:00
parent 3bc739328e
commit 90f5699fff
11 changed files with 430 additions and 406 deletions

View file

@ -52,49 +52,111 @@ impl CommandImpl {
impl ToTokens for CommandDef {
fn to_tokens (&self, out: &mut TokenStream2) {
let Self(CommandMeta(target), CommandImpl(block, exposed)) = self;
let enumeration = &block.self_ty;
let variants = exposed.values().map(|x|x.to_enum_variant_def());
let matchers = exposed.values().map(CommandArm::to_matcher);
let implementations = exposed.values().map(CommandArm::to_implementation);
let Self(CommandMeta(state), CommandImpl(block, exposed)) = self;
let command_enum = &block.self_ty;
let variants = exposed.values().map(|arm|{
let mut out = TokenStream2::new();
out.append(arm.to_enum_variant_ident());
//let ident = &arm.0;
if arm.has_args() {
out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new();
for (arg, ty) in arm.args() {
write_quote_to(&mut out, quote! { #arg : #ty , });
}
out
}));
}
out.append(Punct::new(',', Alone));
out
});
let matchers = exposed.values().map(|arm|{
let key = LitStr::new(&arm.to_key(), Span::call_site());
let variant = {
let mut out = TokenStream2::new();
out.append(arm.to_enum_variant_ident());
let ident = &arm.0;
if arm.has_args() {
out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new();
for (arg, ty) in arm.args() {
write_quote_to(&mut out, quote! {
#arg: Dsl::take_or_fail(self, words)?,
});
}
out
}));
}
out
};
write_quote(quote! {
Some(::tengri::dsl::Token { value: ::tengri::dsl::Value::Key(#key), .. }) => {
let mut words = words.clone();
Some(#command_enum::#variant)
},
//Some(::tengri::dsl::Token {
//value: ::tengri::dsl::Value::Key(#key), ..
//}) => {
//let mut iter = iter.clone(); Some(#command_enum::#variant)
//},
})
});
let implementations = exposed.values().map(|arm|{
let ident = &arm.0;
let variant = {
let mut out = TokenStream2::new();
out.append(arm.to_enum_variant_ident());
//let ident = &arm.0;
if arm.has_args() {
out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new();
for (arg, _ty) in arm.args() {
write_quote_to(&mut out, quote! { #arg , });
}
out
}));
}
out
};
let give_rest = write_quote(quote! { /*TODO*/ });
let give_args = arm.args()
.map(|(arg, _ty)|write_quote(quote! { #arg, }))
.collect::<Vec<_>>();
write_quote(quote! {
#command_enum::#variant =>
#command_enum::#ident(state, #(#give_args)* #give_rest),
})
});
write_quote_to(out, quote! {
/// Generated by [tengri_proc].
#[derive(Clone, Debug)]
pub enum #enumeration {
#(#variants)*
}
#[derive(Clone, Debug)] pub enum #command_enum { #(#variants)* }
/// Not generated by [tengri_proc].
#block
/// Generated by [tengri_proc].
impl<'state> ::tengri::dsl::TryFromDsl<'state, #target> for #enumeration {
fn try_from_expr <'source: 'state> (
state: &'state #target, iter: &mut ::tengri::dsl::TokenIter<'source>
) -> Option<Self> {
let mut iter = iter.clone();
let token = iter.next();
match token {
#(#matchers)*
_ => None
}
impl ::tengri::input::Command<#state> for #command_enum {
fn execute (self, state: &mut #state) -> Perhaps<Self> {
match self { #(#implementations)* }
}
}
/// Generated by [tengri_proc].
impl<'state> ::tengri::dsl::Context<'state, #enumeration> for #target {
fn get <'source> (&self, iter: &mut ::tengri::dsl::TokenIter<'source>)
-> Option<#enumeration>
impl ::tengri::dsl::Dsl<#command_enum> for #state {
fn take <'source, 'state> (
&'state self, words: &mut TokenIter<'source>
)
-> ::tengri::Perhaps<#command_enum>
{
use ::tengri::dsl::TryFromDsl;
#enumeration::try_from_expr(self, iter)
}
}
/// Generated by [tengri_proc].
impl ::tengri::input::Command<#target> for #enumeration {
fn execute (self, state: &mut #target) -> Perhaps<Self> {
match self {
#(#implementations)*
}
let mut words = words.clone();
let token = words.next();
todo!()//Ok(match token { #(#matchers)* _ => None })
}
}
});
//if exposed.len() > 0 {
//panic!("{:#?}", block.self_ty);
//if let Type::Path(ref path) = *block.self_ty {
@ -146,61 +208,4 @@ impl CommandArm {
out.append(Punct::new(',', Alone));
out
}
fn to_enum_variant_bind (&self) -> TokenStream2 {
let mut out = TokenStream2::new();
out.append(self.to_enum_variant_ident());
let ident = &self.0;
if self.has_args() {
out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new();
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 = format!("{}: missing value for \"{}\" ({}): {{:#?}}",
quote!{#ident}, quote!{#arg}, quote!{#ty});
let give_err = LitStr::new(&give_err, Span::call_site());
write_quote_to(&mut out, quote! {
#arg: ::tengri::dsl::Context::get(state, &mut iter)
.unwrap_or_else(||panic!(#give_err, token)),
});
}
out
}));
}
out
}
fn to_enum_variant_unbind (&self) -> TokenStream2 {
let mut out = TokenStream2::new();
out.append(self.to_enum_variant_ident());
//let ident = &self.0;
if self.has_args() {
out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new();
for (arg, _ty) in self.args() {
write_quote_to(&mut out, quote! { #arg , });
}
out
}));
}
out
}
fn to_matcher (&self) -> TokenStream2 {
let key = LitStr::new(&self.to_key(), Span::call_site());
let variant = self.to_enum_variant_bind();
let pattern = quote! {
Some(::tengri::dsl::Token { value: ::tengri::dsl::Value::Key(#key), .. })
};
write_quote(quote! {
#pattern => { let mut iter = iter.clone(); Some(Self::#variant) },
})
}
fn to_implementation (&self) -> TokenStream2 {
let ident = &self.0;
let variant = self.to_enum_variant_unbind();
let give_rest = write_quote(quote! { /*TODO*/ });
let give_args = self.args()
.map(|(arg, _ty)|write_quote(quote! { #arg, }))
.collect::<Vec<_>>();
write_quote(quote! { Self::#variant => Self::#ident(state, #(#give_args)* #give_rest), })
}
}