read explicit lifetime to FromDsl

proc/src/proc_command.rs

@@ -84,7 +84,7 @@ impl ToTokens for CommandDef {
                         let mut out = TokenStream2::new();
                         for (arg, ty) in arm.args() {
                             write_quote_to(&mut out, quote! {
-                                #arg: Dsl::take_or_fail(self, words)?,
+                                #arg: FromDsl::take_from_or_fail(self, words)?,
                             });
                         }
                         out
@@ -137,17 +137,22 @@ impl ToTokens for CommandDef {
             #[derive(Clone, Debug)] pub enum #command_enum { #(#variants)* }
             /// Not generated by [tengri_proc].
             #block
-            /// Generated by [tengri_proc].
+            /// Generated by [tengri_proc::command].
+            ///
+            /// Means [#command_enum] is now a [Command] over [#state].
+            /// Instances of [#command_enum] can be consumed by a 
+            /// mutable pointer to [#state], invoking predefined operations
+            /// and optionally returning undo history data.
             impl ::tengri::input::Command<#state> for #command_enum {
                 fn execute (self, state: &mut #state) -> Perhaps<Self> {
                     match self { #(#implementations)* }
                 }
             }
-            /// Generated by [tengri_proc].
-            impl ::tengri::dsl::FromDsl<#state> for #command_enum {
-                fn take_from <'state, 'source: 'state> (
+            /// Generated by [tengri_proc::command].
+            impl<'source> ::tengri::dsl::FromDsl<'source, #state> for #command_enum {
+                fn take_from <'state> (
                     state: &'state #state,
-                    words: &mut TokenIter<'source>,
+                    words: &mut ::tengri::dsl::TokenIter<'source>
                 ) -> Perhaps<Self> {
                     let mut words = words.clone();
                     let token = words.next();

proc/src/proc_expose.rs

@@ -60,7 +60,7 @@ impl ToTokens for ExposeDef {
 impl ToTokens for ExposeImpl {
     fn to_tokens (&self, out: &mut TokenStream2) {
         let Self(block, exposed) = self;
-        let exposed_impl_type = &block.self_ty;
+        let state = &block.self_ty;
         write_quote_to(out, quote! { #block });
         for (t, variants) in exposed.iter() {
             let formatted_type = format!("{}", quote! { #t }); 
@@ -84,15 +84,15 @@ impl ToTokens for ExposeImpl {
             };
             let values = variants.iter().map(ExposeArm::from);
             write_quote_to(out, quote! {
-                /// Generated by [tengriproc].
-                impl ::tengri::dsl::Dsl<#t> for #exposed_impl_type {
-                    fn take <'state, 'source: 'state> (
-                        &'state self,
+                /// Generated by [tengri_proc::expose].
+                impl<'source> ::tengri::dsl::FromDsl<'source, #state> for #t {
+                    fn take_from <'state> (
+                        state: &'state #state,
                         words: &mut ::tengri::dsl::TokenIter<'source>
-                    ) -> Perhaps<#t> {
+                    ) -> Perhaps<Self> {
                         Ok(Some(match words.next().map(|x|x.value) {
                             #predefined
-                            #(#values,)*
+                            #(#values)*
                             _ => return Ok(None)
                         }))
                     }
@@ -116,7 +116,7 @@ impl ToTokens for ExposeArm {
         let Self(key, value) = self;
         let key = LitStr::new(&key, Span::call_site());
         write_quote_to(out, quote! {
-            Some(::tengri::dsl::Value::Sym(#key)) => self.#value()
+            Some(::tengri::dsl::Value::Sym(#key)) => state.#value(),
         })
     }
 }

proc/src/proc_view.rs

@@ -14,8 +14,6 @@ pub(crate) struct ViewImpl {
     exposed: BTreeMap<String, Ident>,
 }
 
-struct ViewArm(String, Ident);
-
 impl Parse for ViewMeta {
     fn parse (input: ParseStream) -> Result<Self> {
         Ok(Self {
@@ -41,6 +39,60 @@ impl Parse for ViewImpl {
     }
 }
 
+impl ToTokens for ViewDef {
+    fn to_tokens (&self, out: &mut TokenStream2) {
+        let Self(ViewMeta { output }, ViewImpl { block, exposed }) = self;
+        let view = &block.self_ty;
+        let mut available = vec![];
+        let exposed: Vec<_> = exposed.iter().map(|(key, value)|{
+            available.push(key.clone());
+            write_quote(quote! { #key => Some(state.#value().boxed()), })
+        }).collect();
+        let available: String = available.join(", ");
+        let error_msg = LitStr::new(
+            &format!("expected Sym(content), got: {{token:?}}, available: {available}"),
+            Span::call_site()
+        );
+        write_quote_to(out, quote! {
+            #block
+            /// Generated by [tengri_proc].
+            ///
+            /// Delegates the rendering of [#view] to the [#view::view} method,
+            /// which you will need to implement, e.g. passing a [TokenIter]
+            /// containing a layout and keybindings config from user dirs.
+            impl ::tengri::output::Content<#output> for #view {
+                fn content (&self) -> impl Render<#output> {
+                    self.view()
+                }
+            }
+            /// Generated by [tengri_proc].
+            ///
+            /// Gives [#view] the ability to construct the [Render]able
+            /// which might corresponds to a given [TokenStream],
+            /// while taking [#view]'s state into consideration.
+            impl<'source> ::tengri::dsl::FromDsl<'source, #view> for Box<dyn Render<#output> + 'source> {
+                fn take_from <'state> (
+                    state: &'state #view,
+                    words: &mut ::tengri::dsl::TokenIter<'source>,
+                ) -> Perhaps<Self> {
+                    Ok(words.peek().and_then(|::tengri::dsl::Token{ value, .. }|match value {
+                        ::tengri::dsl::Value::Exp(_, exp) => {
+                            todo!("builtin layout ops");
+                            //#builtins
+                            None
+                        },
+                        ::tengri::dsl::Value::Sym(sym) => match sym {
+                            #(#exposed)*
+                            _ => None
+                        },
+                        _ => None
+                    }))
+                }
+            }
+        })
+    }
+}
+
 fn builtins () -> [TokenStream2;14] {
     [
         quote! { When::<A>       },
@@ -59,117 +111,3 @@ fn builtins () -> [TokenStream2;14] {
         quote! { Padding::<_, A> },
     ]
 }
-
-impl ToTokens for ViewDef {
-    fn to_tokens (&self, out: &mut TokenStream2) {
-        let Self(ViewMeta { output }, ViewImpl { block, exposed }) = self;
-        let view = &block.self_ty;
-        let mut available = vec![];
-        let exposed: Vec<_> = exposed.iter()
-            .map(|(k,v)|{ available.push(k.clone()); ViewArm(k.clone(), v.clone()) })
-            .collect();
-        let available: String = available.join(", ");
-        let error_msg = LitStr::new(
-            &format!("expected Sym(content), got: {{token:?}}, available: {available}"),
-            Span::call_site()
-        );
-        for token in quote! {
-            #block
-            /// Generated by [tengri_proc].
-            ///
-            /// Delegates the rendering of [#view] to the [#view::view} method,
-            /// which you will need to implement, e.g. passing a [TokenIter]
-            /// containing a layout and keybindings config from user dirs.
-            impl ::tengri::output::Content<#output> for #view {
-                fn content (&self) -> impl Render<#output> {
-                    self.view()
-                }
-            }
-            /// Generated by [tengri_proc].
-            ///
-            /// Gives [#view] the ability to construct the [Render]able
-            /// which might corresponds to a given [TokenStream],
-            /// while taking [#view]'s state into consideration.
-            impl<'context> ::tengri::dsl::FromDsl<#view> for RenderBox<'context, #output> {
-                fn take_from <'state, 'source: 'state> (
-                    state: &'state #view, words: &mut ::tengri::dsl::TokenIter<'source>
-                ) -> Perhaps<Self> {
-                    Ok(match words.peek() {
-                        Some(::tengri::dsl::Token { value: ::tengri::dsl::Value::Exp(exp), .. }) => {
-                            if let Some(value) = FromDsl::take_from(state, words)? {
-                                return Ok(Some(value.boxed()))
-                            }
-                            //#builtins
-                            None
-                        },
-                        #(#exposed)*
-                        _ => None
-                    })
-                }
-            }
-        } {
-            out.append(token)
-        }
-    }
-}
-
-impl ToTokens for ViewArm {
-    fn to_tokens (&self, out: &mut TokenStream2) {
-        let Self(key, value) = self;
-        out.append(Ident::new("Some", Span::call_site()));
-        out.append(Group::new(Delimiter::Parenthesis, {
-            let mut out = TokenStream2::new();
-            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));
-        out.append(Punct::new('>', Alone));
-        out.append(Ident::new("Some", Span::call_site()));
-        out.append(Group::new(Delimiter::Parenthesis, {
-            let mut out = TokenStream2::new();
-            out.append(Ident::new("state", Span::call_site()));
-            out.append(Punct::new('.', Alone));
-            out.append(value.clone());
-            out.append(Group::new(Delimiter::Parenthesis, TokenStream2::new()));
-            out.append(Punct::new('.', Alone));
-            out.append(Ident::new("boxed", Span::call_site()));
-            out.append(Group::new(Delimiter::Parenthesis, TokenStream2::new()));
-            out
-        }));
-        out.append(Punct::new(',', Alone));
-    }
-}