From 73529ea650573196762ee4135a37682845501255 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 23 Feb 2019 22:35:29 +0100 Subject: [PATCH] reject duplicate arguments in #[interrupt] and #[exception] This program was being accepted: ``` rust #[task( capacity = 1, capacity = 2, priority = 1, priority = 2, )] fn foo() {} ``` now it will trigger a compiler error --- macros/src/syntax.rs | 14 ++++++++++++++ tests/cfail/duplicate-args-2.rs | 24 ++++++++++++++++++++++++ tests/cfail/duplicate-args.rs | 24 ++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 tests/cfail/duplicate-args-2.rs create mode 100644 tests/cfail/duplicate-args.rs diff --git a/macros/src/syntax.rs b/macros/src/syntax.rs index 581eb8319b..9771ea922e 100644 --- a/macros/src/syntax.rs +++ b/macros/src/syntax.rs @@ -937,6 +937,13 @@ fn parse_args(input: ParseStream<'_>, accept_capacity: bool) -> parse::Result { + if capacity.is_some() { + return Err(parse::Error::new( + ident.span(), + "argument appears more than once", + )); + } + // #lit let lit: LitInt = content.parse()?; @@ -958,6 +965,13 @@ fn parse_args(input: ParseStream<'_>, accept_capacity: bool) -> parse::Result { + if priority.is_some() { + return Err(parse::Error::new( + ident.span(), + "argument appears more than once", + )); + } + // #lit let lit: LitInt = content.parse()?; diff --git a/tests/cfail/duplicate-args-2.rs b/tests/cfail/duplicate-args-2.rs new file mode 100644 index 0000000000..1a196e99f8 --- /dev/null +++ b/tests/cfail/duplicate-args-2.rs @@ -0,0 +1,24 @@ +#![no_main] +#![no_std] + +extern crate lm3s6965; +extern crate panic_halt; +extern crate rtfm; + +use rtfm::app; + +#[app(device = lm3s6965)] +const APP: () = { + #[init] + fn init() {} + + #[task( + priority = 1, + priority = 2, //~ ERROR argument appears more than once + )] + fn foo() {} + + extern "C" { + fn UART0(); + } +}; diff --git a/tests/cfail/duplicate-args.rs b/tests/cfail/duplicate-args.rs new file mode 100644 index 0000000000..a946bae223 --- /dev/null +++ b/tests/cfail/duplicate-args.rs @@ -0,0 +1,24 @@ +#![no_main] +#![no_std] + +extern crate lm3s6965; +extern crate panic_halt; +extern crate rtfm; + +use rtfm::app; + +#[app(device = lm3s6965)] +const APP: () = { + #[init] + fn init() {} + + #[task( + capacity = 1, + capacity = 2, //~ ERROR argument appears more than once + )] + fn foo() {} + + extern "C" { + fn UART0(); + } +};