Rename const_app to mod_app

This commit is contained in:
Henrik Tjäder 2020-10-01 16:17:15 +00:00
parent b4ec6f5eff
commit 96e6350c0d
6 changed files with 52 additions and 64 deletions

View file

@ -25,8 +25,8 @@ mod util;
// TODO document the syntax here or in `rtic-syntax`
pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let mut const_app = vec![];
let mut const_app_imports = vec![];
let mut mod_app = vec![];
let mut mod_app_imports = vec![];
let mut mains = vec![];
let mut root = vec![];
let mut user = vec![];
@ -37,21 +37,21 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let pre_init_stmts = pre_init::codegen(&app, analysis, extra);
let (const_app_init, root_init, user_init, user_init_imports, call_init) =
let (mod_app_init, root_init, user_init, user_init_imports, call_init) =
init::codegen(app, analysis, extra);
let post_init_stmts = post_init::codegen(&app, analysis);
let (const_app_idle, root_idle, user_idle, user_idle_imports, call_idle) =
let (mod_app_idle, root_idle, user_idle, user_idle_imports, call_idle) =
idle::codegen(app, analysis, extra);
if user_init.is_some() {
const_app_imports.push(quote!(
mod_app_imports.push(quote!(
use super::init;
))
}
if user_idle.is_some() {
const_app_imports.push(quote!(
mod_app_imports.push(quote!(
use super::idle;
))
}
@ -73,10 +73,10 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
#(#root_idle)*
));
const_app.push(quote!(
#const_app_init
mod_app.push(quote!(
#mod_app_init
#const_app_idle
#mod_app_idle
));
let main = util::suffixed("main");
@ -97,30 +97,30 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
}
));
let (const_app_resources, mod_resources, mod_resources_imports) =
let (mod_app_resources, mod_resources, mod_resources_imports) =
resources::codegen(app, analysis, extra);
let (
const_app_hardware_tasks,
mod_app_hardware_tasks,
root_hardware_tasks,
user_hardware_tasks,
user_hardware_tasks_imports,
) = hardware_tasks::codegen(app, analysis, extra);
let (
const_app_software_tasks,
mod_app_software_tasks,
root_software_tasks,
user_software_tasks,
user_software_tasks_imports,
) = software_tasks::codegen(app, analysis, extra);
let const_app_dispatchers = dispatchers::codegen(app, analysis, extra);
let mod_app_dispatchers = dispatchers::codegen(app, analysis, extra);
let const_app_spawn = spawn::codegen(app, analysis, extra);
let mod_app_spawn = spawn::codegen(app, analysis, extra);
let const_app_timer_queue = timer_queue::codegen(app, analysis, extra);
let mod_app_timer_queue = timer_queue::codegen(app, analysis, extra);
let const_app_schedule = schedule::codegen(app, extra);
let mod_app_schedule = schedule::codegen(app, extra);
let user_imports = app.user_imports.clone();
let user_code = app.user_code.clone();
@ -159,22 +159,22 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
#(#mod_resources_imports)*
/// Const app
#(#const_app)*
/// app module
#(#mod_app)*
#(#const_app_resources)*
#(#mod_app_resources)*
#(#const_app_hardware_tasks)*
#(#mod_app_hardware_tasks)*
#(#const_app_software_tasks)*
#(#mod_app_software_tasks)*
#(#const_app_dispatchers)*
#(#mod_app_dispatchers)*
#(#const_app_spawn)*
#(#mod_app_spawn)*
#(#const_app_timer_queue)*
#(#mod_app_timer_queue)*
#(#const_app_schedule)*
#(#mod_app_schedule)*
#(#mains)*
}