diff options
author | 2023-01-07 14:13:18 +0100 | |
---|---|---|
committer | 2023-03-01 00:31:07 +0100 | |
commit | b9b3ded5e21c40256163cf85f4fba2991c03a45c (patch) | |
tree | 2ec4625f74906e8289b1227c72bc5943d139ed0c /macros/src | |
parent | 4337e3980c52116e1606c60ff12eaea4a9971ece (diff) | |
download | rtic-b9b3ded5e21c40256163cf85f4fba2991c03a45c.tar.gz rtic-b9b3ded5e21c40256163cf85f4fba2991c03a45c.tar.zst rtic-b9b3ded5e21c40256163cf85f4fba2991c03a45c.zip |
Cleanup weird locals in codegen
Diffstat (limited to 'macros/src')
-rw-r--r-- | macros/src/codegen.rs | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs index 839b1cd4..bb1028f7 100644 --- a/macros/src/codegen.rs +++ b/macros/src/codegen.rs @@ -27,10 +27,6 @@ mod main; #[allow(clippy::too_many_lines)] pub fn app(app: &App, analysis: &Analysis) -> TokenStream2 { - let mut mod_app = vec![]; - let mut root = vec![]; - let mut user = vec![]; - // Generate the `main` function let main = main::codegen(app, analysis); @@ -38,24 +34,6 @@ pub fn app(app: &App, analysis: &Analysis) -> TokenStream2 { let (mod_app_idle, root_idle, user_idle) = idle::codegen(app, analysis); - user.push(quote!( - #user_init - - #user_idle - )); - - root.push(quote!( - #(#root_init)* - - #(#root_idle)* - )); - - mod_app.push(quote!( - #mod_app_init - - #(#mod_app_idle)* - )); - let (mod_app_shared_resources, mod_shared_resources) = shared_resources::codegen(app, analysis); let (mod_app_local_resources, mod_local_resources) = local_resources::codegen(app, analysis); @@ -85,13 +63,21 @@ pub fn app(app: &App, analysis: &Analysis) -> TokenStream2 { #(#user_code)* /// User code end - #(#user)* - #(#user_hardware_tasks)* #(#user_software_tasks)* - #(#root)* + #mod_app_init + + #(#root_init)* + + #user_init + + #(#mod_app_idle)* + + #(#root_idle)* + + #user_idle #mod_shared_resources @@ -101,9 +87,6 @@ pub fn app(app: &App, analysis: &Analysis) -> TokenStream2 { #(#root_software_tasks)* - /// app module - #(#mod_app)* - #(#mod_app_shared_resources)* #(#mod_app_local_resources)* |