aboutsummaryrefslogtreecommitdiff
path: root/macros/src/syntax
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src/syntax')
-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
3 files changed, 10 insertions, 23 deletions
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)?;