mirror of
https://codeberg.org/unspeaker/tengri.git
synced 2025-12-06 11:46:42 +01:00
dsl: use only Dsl trait
This commit is contained in:
parent
3bc739328e
commit
90f5699fff
11 changed files with 430 additions and 406 deletions
|
|
@ -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), })
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,15 +85,15 @@ impl ToTokens for ExposeImpl {
|
|||
let values = variants.iter().map(ExposeArm::from);
|
||||
write_quote_to(out, quote! {
|
||||
/// Generated by [tengri_proc].
|
||||
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) {
|
||||
impl ::tengri::dsl::Dsl<#t> for #target {
|
||||
fn take <'state, 'source> (
|
||||
&'state self, iter: &mut ::tengri::dsl::TokenIter<'source>
|
||||
) -> Perhaps<#t> {
|
||||
Ok(Some(match iter.next().map(|x|x.value) {
|
||||
#predefined
|
||||
#(#values,)*
|
||||
_ => return None
|
||||
})
|
||||
_ => return Ok(None)
|
||||
}))
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ impl ToTokens for ViewDef {
|
|||
}).collect();
|
||||
let available: String = available.join(", ");
|
||||
let error_msg = LitStr::new(
|
||||
&format!("expected Sym(content), got: {{value:?}}, available: {available}"),
|
||||
&format!("expected Sym(content), got: {{iter:?}}, available: {available}"),
|
||||
Span::call_site()
|
||||
);
|
||||
for token in quote! {
|
||||
|
|
@ -60,15 +60,16 @@ impl ToTokens for ViewDef {
|
|||
/// Generated by [tengri_proc].
|
||||
impl ::tengri::output::Content<#output> for #ident {
|
||||
fn content (&self) -> impl Render<#output> {
|
||||
// TODO move to self.view()
|
||||
self.size.of(::tengri::output::View(self, self.config.view))
|
||||
}
|
||||
}
|
||||
/// Generated by [tengri_proc].
|
||||
impl<'state> ::tengri::output::ViewContext<'state, #output> for #ident {
|
||||
fn get_content_sym <'source: 'state> (&'state self, value: &Value<'source>)
|
||||
-> Option<RenderBox<'state, #output>>
|
||||
fn get_content_sym <'source: 'state> (&'state self, iter: &mut TokenIter<'source>)
|
||||
-> ::tengri::Perhaps<RenderBox<'state, #output>>
|
||||
{
|
||||
match value { #(#exposed)* _ => panic!(#error_msg) }
|
||||
Ok(match iter.peek() { #(#exposed)* _ => panic!(#error_msg) })
|
||||
}
|
||||
}
|
||||
} {
|
||||
|
|
@ -80,21 +81,44 @@ impl ToTokens for ViewDef {
|
|||
impl ToTokens for ViewArm {
|
||||
fn to_tokens (&self, out: &mut TokenStream2) {
|
||||
let Self(key, value) = self;
|
||||
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(Ident::new("Some", Span::call_site()));
|
||||
out.append(Group::new(Delimiter::Parenthesis, {
|
||||
let mut out = TokenStream2::new();
|
||||
out.append(LitStr::new(key, Span::call_site()).token());
|
||||
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));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue