From ef5307d83a1d62df0569d78db75d4006147c927d Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 6 Jul 2021 22:47:48 +0200
Subject: Minimal app now compiles

---
 macros/src/codegen/idle.rs | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'macros/src/codegen/idle.rs')

diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index 4bc41c1..9c8a5f7 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.rs
@@ -5,7 +5,7 @@ use rtic_syntax::{ast::App, Context};
 use crate::{
     analyze::Analysis,
     check::Extra,
-    codegen::{locals, module, resources_struct},
+    codegen::{local_resources_struct, module, shared_resources_struct},
 };
 
 /// Generates support code for `#[idle]` functions
@@ -26,30 +26,28 @@ pub fn codegen(
     // call_idle
     TokenStream2,
 ) {
-    if !app.idles.is_empty() {
-        let idle = &app.idles.first().unwrap();
+    if let Some(idle) = &app.idle {
         let mut needs_lt = false;
         let mut mod_app = None;
         let mut root_idle = vec![];
-        let mut locals_pat = None;
-        let mut locals_new = None;
 
         let name = &idle.name;
 
-        if !idle.args.resources.is_empty() {
-            let (item, constructor) = resources_struct::codegen(Context::Idle, &mut needs_lt, app);
+        if !idle.args.shared_resources.is_empty() {
+            let (item, constructor) = shared_resources_struct::codegen(Context::Idle, &mut needs_lt, app);
 
             root_idle.push(item);
             mod_app = Some(constructor);
         }
 
-        if !idle.locals.is_empty() {
-            let (locals, pat) = locals::codegen(Context::Idle, &idle.locals, app);
+        // TODO: Fix locals
+        // if !idle.locals.is_empty() {
+        //     let (locals, pat) = locals::codegen(Context::Idle, &idle.locals, app);
 
-            locals_new = Some(quote!(#name::Locals::new()));
-            locals_pat = Some(pat);
-            root_idle.push(locals);
-        }
+        //     locals_new = Some(quote!(#name::Locals::new()));
+        //     locals_pat = Some(pat);
+        //     root_idle.push(locals);
+        // }
 
         root_idle.push(module::codegen(
             Context::Idle,
@@ -62,11 +60,10 @@ pub fn codegen(
         let attrs = &idle.attrs;
         let context = &idle.context;
         let stmts = &idle.stmts;
-        let locals_pat = locals_pat.iter();
         let user_idle = Some(quote!(
             #(#attrs)*
             #[allow(non_snake_case)]
-            fn #name(#(#locals_pat,)* #context: #name::Context) -> ! {
+            fn #name(#context: #name::Context) -> ! {
                 use rtic::Mutex as _;
                 use rtic::mutex_prelude::*;
 
@@ -74,9 +71,7 @@ pub fn codegen(
             }
         ));
 
-        let locals_new = locals_new.iter();
         let call_idle = quote!(#name(
-            #(#locals_new,)*
             #name::Context::new(&rtic::export::Priority::new(0))
         ));
 
-- 
cgit v1.2.3


From d7393c5b27fc95f3569d12137ee0c4d03ff7e2ba Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Wed, 7 Jul 2021 21:03:56 +0200
Subject: Full local resource syntax working

---
 macros/src/codegen/idle.rs | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'macros/src/codegen/idle.rs')

diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index 9c8a5f7..d653931 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 {
-- 
cgit v1.2.3