aboutsummaryrefslogtreecommitdiff
path: root/macros/src
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src')
-rw-r--r--macros/src/lib.rs27
-rw-r--r--macros/src/syntax.rs24
-rw-r--r--macros/src/syntax/optimize.rs2
-rw-r--r--macros/src/syntax/parse.rs20
-rw-r--r--macros/src/syntax/parse/app.rs11
5 files changed, 16 insertions, 68 deletions
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 1bda8d2f..34f2bb61 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -18,25 +18,7 @@ mod syntax;
#[doc(hidden)]
#[proc_macro_attribute]
pub fn mock_app(args: TokenStream, input: TokenStream) -> TokenStream {
- let mut settings = syntax::Settings::default();
- let mut rtic_args = vec![];
- for arg in args.to_string().split(',') {
- if arg.trim() == "parse_binds" {
- settings.parse_binds = true;
- } else if arg.trim() == "parse_extern_interrupt" {
- settings.parse_extern_interrupt = true;
- } else {
- rtic_args.push(arg.to_string());
- }
- }
-
- // rtic_args.push("device = mock".into());
-
- let args = rtic_args.join(", ").parse();
-
- println!("args: {:?}", args);
-
- if let Err(e) = syntax::parse(args.unwrap(), input, settings) {
+ if let Err(e) = syntax::parse(args, input) {
e.to_compile_error().into()
} else {
"fn main() {}".parse().unwrap()
@@ -52,12 +34,7 @@ pub fn mock_app(args: TokenStream, input: TokenStream) -> TokenStream {
/// Should never panic, cargo feeds a path which is later converted to a string
#[proc_macro_attribute]
pub fn app(args: TokenStream, input: TokenStream) -> TokenStream {
- let mut settings = syntax::Settings::default();
- settings.optimize_priorities = false;
- settings.parse_binds = true;
- settings.parse_extern_interrupt = true;
-
- let (app, analysis) = match syntax::parse(args, input, settings) {
+ let (app, analysis) = match syntax::parse(args, input) {
Err(e) => return e.to_compile_error().into(),
Ok(x) => x,
};
diff --git a/macros/src/syntax.rs b/macros/src/syntax.rs
index 09b2ab3d..d6f5a476 100644
--- a/macros/src/syntax.rs
+++ b/macros/src/syntax.rs
@@ -13,7 +13,6 @@ mod accessors;
pub mod analyze;
pub mod ast;
mod check;
-mod optimize;
mod parse;
/// An ordered map keyed by identifier
@@ -31,10 +30,10 @@ pub enum Context<'a> {
/// The `init`-ialization function
Init,
- /// A software task: `#[task]`
+ /// A async software task
SoftwareTask(&'a Ident),
- /// A hardware task: `#[exception]` or `#[interrupt]`
+ /// A hardware task
HardwareTask(&'a Ident),
}
@@ -93,36 +92,21 @@ impl<'a> Context<'a> {
}
}
-/// Parser and optimizer configuration
-#[derive(Default)]
-#[non_exhaustive]
-pub struct Settings {
- /// Whether to accept the `binds` argument in `#[task]` or not
- pub parse_binds: bool,
- /// Whether to parse `extern` interrupts (functions) or not
- pub parse_extern_interrupt: bool,
- /// Whether to "compress" priorities or not
- pub optimize_priorities: bool,
-}
-
/// Parses the input of the `#[app]` attribute
pub fn parse(
args: TokenStream,
input: TokenStream,
- settings: Settings,
) -> Result<(ast::App, analyze::Analysis), syn::parse::Error> {
- parse2(args.into(), input.into(), settings)
+ parse2(args.into(), input.into())
}
/// `proc_macro2::TokenStream` version of `parse`
pub fn parse2(
args: TokenStream2,
input: TokenStream2,
- settings: Settings,
) -> Result<(ast::App, analyze::Analysis), syn::parse::Error> {
- let mut app = parse::app(args, input, &settings)?;
+ let app = parse::app(args, input)?;
check::app(&app)?;
- optimize::app(&mut app, &settings);
match analyze::app(&app) {
Err(e) => Err(e),
diff --git a/macros/src/syntax/optimize.rs b/macros/src/syntax/optimize.rs
index 87a6258d..e83ba31b 100644
--- a/macros/src/syntax/optimize.rs
+++ b/macros/src/syntax/optimize.rs
@@ -1,6 +1,6 @@
use std::collections::{BTreeSet, HashMap};
-use crate::syntax::{ast::App, Settings};
+use crate::syntax::ast::App;
pub fn app(app: &mut App, settings: &Settings) {
// "compress" priorities
diff --git a/macros/src/syntax/parse.rs b/macros/src/syntax/parse.rs
index 74f94f2b..ceedaa98 100644
--- a/macros/src/syntax/parse.rs
+++ b/macros/src/syntax/parse.rs
@@ -20,15 +20,15 @@ use crate::syntax::{
App, AppArgs, HardwareTaskArgs, IdleArgs, InitArgs, MonotonicArgs, SoftwareTaskArgs,
TaskLocal,
},
- Either, Settings,
+ Either,
};
// Parse the app, both app arguments and body (input)
-pub fn app(args: TokenStream2, input: TokenStream2, settings: &Settings) -> parse::Result<App> {
+pub fn app(args: TokenStream2, input: TokenStream2) -> parse::Result<App> {
let args = AppArgs::parse(args)?;
let input: Input = syn::parse2(input)?;
- App::parse(args, input, settings)
+ App::parse(args, input)
}
pub(crate) struct Input {
@@ -188,10 +188,7 @@ fn idle_args(tokens: TokenStream2) -> parse::Result<IdleArgs> {
.parse2(tokens)
}
-fn task_args(
- tokens: TokenStream2,
- settings: &Settings,
-) -> parse::Result<Either<HardwareTaskArgs, SoftwareTaskArgs>> {
+fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, SoftwareTaskArgs>> {
(|input: ParseStream<'_>| -> parse::Result<Either<HardwareTaskArgs, SoftwareTaskArgs>> {
if input.is_empty() {
return Ok(Either::Right(SoftwareTaskArgs::default()));
@@ -242,14 +239,7 @@ fn task_args(
let _: Token![=] = content.parse()?;
match &*ident_s {
- "binds" if !settings.parse_binds => {
- return Err(parse::Error::new(
- ident.span(),
- "Unexpected bind in task argument. Binds are only parsed if Settings::parse_binds is set.",
- ));
- }
-
- "binds" if settings.parse_binds => {
+ "binds" => {
if binds.is_some() {
return Err(parse::Error::new(
ident.span(),
diff --git a/macros/src/syntax/parse/app.rs b/macros/src/syntax/parse/app.rs
index 7eb415d3..dd7c3999 100644
--- a/macros/src/syntax/parse/app.rs
+++ b/macros/src/syntax/parse/app.rs
@@ -15,7 +15,7 @@ use crate::syntax::{
LocalResource, Monotonic, MonotonicArgs, SharedResource, SoftwareTask,
},
parse::{self as syntax_parse, util},
- Either, Map, Set, Settings,
+ Either, Map, Set,
};
impl AppArgs {
@@ -142,7 +142,7 @@ impl AppArgs {
}
impl App {
- pub(crate) fn parse(args: AppArgs, input: Input, settings: &Settings) -> parse::Result<Self> {
+ pub(crate) fn parse(args: AppArgs, input: Input) -> parse::Result<Self> {
let mut init = None;
let mut idle = None;
@@ -253,7 +253,7 @@ impl App {
));
}
- match syntax_parse::task_args(item.attrs.remove(pos).tokens, settings)? {
+ match syntax_parse::task_args(item.attrs.remove(pos).tokens)? {
Either::Left(args) => {
check_binding(&args.binds)?;
check_ident(&item.sig.ident)?;
@@ -410,10 +410,7 @@ impl App {
));
}
- match syntax_parse::task_args(
- item.attrs.remove(pos).tokens,
- settings,
- )? {
+ match syntax_parse::task_args(item.attrs.remove(pos).tokens)? {
Either::Left(args) => {
check_binding(&args.binds)?;
check_ident(&item.sig.ident)?;
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-31 05:50:23 +0000