From 7c348c3b1d1f864821f0524905942e55ad8bdeda Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 3 May 2025 18:11:10 +0300 Subject: [PATCH] wip: proc: view macro implementation --- proc/src/proc_view.rs | 84 +++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 22 deletions(-) diff --git a/proc/src/proc_view.rs b/proc/src/proc_view.rs index b9737d1..fe91a8b 100644 --- a/proc/src/proc_view.rs +++ b/proc/src/proc_view.rs @@ -1,19 +1,26 @@ use proc_macro::TokenStream; -use proc_macro2::{TokenStream as TokenStream2}; +use proc_macro2::{TokenStream as TokenStream2, TokenTree, Ident}; +use syn::parse_macro_input; +use syn::{Expr, Attribute, Meta, MetaList, Path, PathSegment, PathArguments, ImplItem}; +use syn::parse::{Parse, ParseStream, Result}; +use syn::token::PathSep; +use syn::punctuated::Punctuated; pub(crate) fn view_impl (meta: TokenStream, item: TokenStream) -> TokenStream { - let ViewMeta { output, define, attrs } = syn::parse_macro_input!(meta as ViewMeta); - let ViewItem { target, mapped, items } = syn::parse_macro_input!(item as ViewItem); + let ViewMeta { output, define, attrs, .. } = parse_macro_input!(meta as ViewMeta); + let ViewItem { target, mapped, items, .. } = parse_macro_input!(item as ViewItem); quote::quote! { - #attrs + #(#attrs)* impl #target { - #items + #(#items)* } + /// Generated by [tengri_proc]. impl ::tengri::Content<#output> for #target { fn content (&self) -> impl Render<#output> { self.size.of(::tengri::View(self, #define)) } } + /// Generated by [tengri_proc]. impl<'a> ::tengri::ViewContext<'a, #output> for #target { fn get_content_sym (&'a self, value: &Value<'a>) -> Option> { match value { @@ -34,31 +41,57 @@ pub(crate) fn view_impl (meta: TokenStream, item: TokenStream) -> TokenStream { } struct ViewMeta { - attrs: &'static str, - output: &'static str, - define: &'static str, + attrs: Vec, + output: Option, + define: Expr, } -impl syn::parse::Parse for ViewMeta { - fn parse (input: syn::parse::ParseStream) -> syn::parse::Result { - Ok(Self { - attrs: "", - output: "", - define: "", - }) +impl Parse for ViewMeta { + fn parse (input: ParseStream) -> Result { + let mut output = None; + let mut define = None; + let mut attrs = input.call(Attribute::parse_outer)?.into_iter().filter(|attr| { + if let Attribute { meta: Meta::List(MetaList { path, tokens, .. }), .. } = attr + && path.segments.len() == 2 + && nth_segment_is(&path.segments, 0, "tengri") + && nth_segment_is(&path.segments, 1, "view") + && let Some(TokenTree::Group(group)) = tokens.clone().into_iter().next() + && let Some(TokenTree::Ident(ident)) = group.stream().into_iter().next() + { + output = Some(ident); + return false + } + true + }).collect(); + + if let Some(define) = define { + Ok(Self { attrs, output, define }) + } else { + Err(input.error("Missing view definition.")) + } } } +fn nth_segment_is (segments: &Punctuated, n: usize, x: &str) -> bool { + if let Some(PathSegment { arguments: PathArguments::None, ident, .. }) = segments.get(n) { + if format!("{ident}") != x { + return true + } + } + return false +} + struct ViewItem { - items: &'static str, + items: Vec, target: &'static str, mapped: &'static str, } -impl syn::parse::Parse for ViewItem { - fn parse (input: syn::parse::ParseStream) -> syn::parse::Result { +impl Parse for ViewItem { + fn parse (input: ParseStream) -> Result { + let items = vec![]; Ok(Self { - items: "", + items, target: "", mapped: "", }) @@ -67,12 +100,19 @@ impl syn::parse::Parse for ViewItem { #[cfg(test)] #[test] fn test_view () { - let _: syn::ItemImpl = syn::parse_quote! { + use syn::{ItemImpl, parse_quote}; + + let _: ItemImpl = parse_quote! { #[tengri::view(Tui)] impl SomeView { - #[tengri::view(":view")] + #[tengri::view] fn view (&self) -> impl Content + use<'_> { - "view" + "view-1" + } + + #[tengri::view(":view-1")] + fn view_1 (&self) -> impl Content + use<'_> { + "view-1" } } };