diff options
Diffstat (limited to 'macros/src/codegen/idle.rs')
| -rw-r--r-- | macros/src/codegen/idle.rs | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index 9c8a5f76..d6539316 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -15,7 +15,7 @@ pub fn codegen( extra: &Extra, ) -> ( // mod_app_idle -- the `${idle}Resources` constructor - Option<TokenStream2>, + Vec<TokenStream2>, // root_idle -- items that must be placed in the root of the crate: // - the `${idle}Locals` struct // - the `${idle}Resources` struct @@ -27,31 +27,34 @@ pub fn codegen( TokenStream2, ) { if let Some(idle) = &app.idle { - let mut needs_lt = false; - let mut mod_app = None; + let mut shared_needs_lt = false; + let mut local_needs_lt = false; + let mut mod_app = vec![]; let mut root_idle = vec![]; let name = &idle.name; if !idle.args.shared_resources.is_empty() { - let (item, constructor) = shared_resources_struct::codegen(Context::Idle, &mut needs_lt, app); + let (item, constructor) = + shared_resources_struct::codegen(Context::Idle, &mut shared_needs_lt, app); root_idle.push(item); - mod_app = Some(constructor); + mod_app.push(constructor); } - // TODO: Fix locals - // if !idle.locals.is_empty() { - // let (locals, pat) = locals::codegen(Context::Idle, &idle.locals, app); + if !idle.args.local_resources.is_empty() { + let (item, constructor) = + local_resources_struct::codegen(Context::Idle, &mut local_needs_lt, app); - // locals_new = Some(quote!(#name::Locals::new())); - // locals_pat = Some(pat); - // root_idle.push(locals); - // } + root_idle.push(item); + + mod_app.push(constructor); + } root_idle.push(module::codegen( Context::Idle, - needs_lt, + shared_needs_lt, + local_needs_lt, app, analysis, extra, @@ -78,7 +81,7 @@ pub fn codegen( (mod_app, root_idle, user_idle, call_idle) } else { ( - None, + vec![], vec![], None, quote!(loop { |