diff options
author | 2020-05-29 14:50:28 +0200 | |
---|---|---|
committer | 2020-05-29 14:50:28 +0200 | |
commit | 0ad311074e3d49a66174f59c47c4d6183ce7e3a0 (patch) | |
tree | 0dc14a960059209d864629c3134c318c978f1686 /macros | |
parent | 1e827e24d024e910b44f6cc6db278e4c66a77683 (diff) | |
download | rtic-0ad311074e3d49a66174f59c47c4d6183ce7e3a0.tar.gz rtic-0ad311074e3d49a66174f59c47c4d6183ce7e3a0.tar.zst rtic-0ad311074e3d49a66174f59c47c4d6183ce7e3a0.zip |
allow handlers to be named 'main'
`#[init]`, `#[idle]` and `#[task]` handlers can now be named `main`
fixes #311
Diffstat (limited to 'macros')
-rw-r--r-- | macros/src/codegen/dispatchers.rs | 2 | ||||
-rw-r--r-- | macros/src/codegen/idle.rs | 2 | ||||
-rw-r--r-- | macros/src/codegen/init.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/macros/src/codegen/dispatchers.rs b/macros/src/codegen/dispatchers.rs index 9a9cb102..1400786b 100644 --- a/macros/src/codegen/dispatchers.rs +++ b/macros/src/codegen/dispatchers.rs @@ -141,7 +141,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream #let_instant #fq.split().0.enqueue_unchecked(index); let priority = &rtfm::export::Priority::new(PRIORITY); - #name( + crate::#name( #locals_new #name::Context::new(priority #instant) #(,#pats)* diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index 35a72523..72432f67 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -72,7 +72,7 @@ pub fn codegen( )); let locals_new = locals_new.iter(); - let call_idle = quote!(#name( + let call_idle = quote!(crate::#name( #(#locals_new,)* #name::Context::new(&rtfm::export::Priority::new(0)) )); diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index 9c8ce31c..fc2faa34 100644 --- a/macros/src/codegen/init.rs +++ b/macros/src/codegen/init.rs @@ -105,7 +105,7 @@ pub fn codegen( let locals_new = locals_new.iter(); let call_init = - Some(quote!(let late = #name(#(#locals_new,)* #name::Context::new(core.into()));)); + Some(quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));)); root_init.push(module::codegen(Context::Init(core), needs_lt, app, extra)); |