alex/nih-plug
1
0
Fork 0
Code Activity

Improve and simplify token handling in macros

Browse source 
The standard library macros also use a `$($foo:tt)*` for this, so we
should probably too. Since eprinln!() already handles trailing commas we
don't need to do any special handling, and this fixes parsing with
complex expressions as arguments.
This commit is contained in:
Robbert van der Helm 2022-01-28 14:47:26 +01:00
parent 71dc144c73
commit 3064132821
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/debug.rs
View file

@ -22,8 +22,8 @@
/// allocations. /// allocations.
#[macro_export] #[macro_export]
macro_rules! nih_log { macro_rules! nih_log {
($format:expr $(, $arg:tt)* $(,)?) => ( ($format:expr $(, $($args:tt)*)?) => (
eprintln!(concat!("[", file!(), ":", line!(), "] ", $format), $($arg)*) eprintln!(concat!("[", file!(), ":", line!(), "] ", $format), $($($args)*)?)
); );
} }
@ -38,9 +38,9 @@ macro_rules! nih_debug_assert {
nih_log!(concat!("Debug assertion failed: ", stringify!($cond))); nih_log!(concat!("Debug assertion failed: ", stringify!($cond)));
} }
); );
($cond:expr, $format:expr $(, $arg:tt)* $(,)?) => ( ($cond:expr, $format:expr $(, $($args:tt)*)?) => (
if cfg!(debug_assertions) && !$cond { if cfg!(debug_assertions) && !$cond {
nih_log!(concat!("Debug assertion failed: ", stringify!($cond), ", ", $format) $(, $arg)*); nih_log!(concat!("Debug assertion failed: ", stringify!($cond), ", ", $format), $($($args)*)?);
} }
); );
} }
@ -54,9 +54,9 @@ macro_rules! nih_debug_assert_failure {
nih_log!("Debug assertion failed"); nih_log!("Debug assertion failed");
} }
); );
($format:expr $(, $arg:tt)* $(,)?) => ( ($format:expr $(, $($args:tt)*)?) => (
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
nih_log!(concat!("Debug assertion failed: ", $format) $(, $arg)*); nih_log!(concat!("Debug assertion failed: ", $format), $($($args)*)?);
} }
); );
} }
@ -70,9 +70,9 @@ macro_rules! nih_debug_assert_eq {
nih_log!(concat!("Debug assertion failed: ", stringify!($left), " != ", stringify!($right))); nih_log!(concat!("Debug assertion failed: ", stringify!($left), " != ", stringify!($right)));
} }
); );
(left:expr, $right:expr, $format:expr $(, $arg:tt)* $(,)?) => ( (left:expr, $right:expr, $format:expr $(, $($args:tt)*)?) => (
if cfg!(debug_assertions) && $left != $right { if cfg!(debug_assertions) && $left != $right {
nih_log!(concat!("Debug assertion failed: ", stringify!($left), " != ", stringify!($right), ", ", $format) $(, $arg)*); nih_log!(concat!("Debug assertion failed: ", stringify!($left), " != ", stringify!($right), ", ", $format), $($($args)*)?);
} }
); );
} }
@ -86,9 +86,9 @@ macro_rules! nih_debug_assert_neq {
nih_log!(concat!("Debug assertion failed: ", stringify!($left), " == ", stringify!($right))); nih_log!(concat!("Debug assertion failed: ", stringify!($left), " == ", stringify!($right)));
} }
); );
(left:expr, $right:expr, $format:expr $(, $arg:tt)* $(,)?) => ( (left:expr, $right:expr, $format:expr $(, $($args:tt)*)?) => (
if cfg!(debug_assertions) && $left == $right { if cfg!(debug_assertions) && $left == $right {
nih_log!(concat!("Debug assertion failed: ", stringify!($left), " == ", stringify!($right), ", ", $format) $(, $arg)*); nih_log!(concat!("Debug assertion failed: ", stringify!($left), " == ", stringify!($right), ", ", $format), $($($args)*)?);
} }
); );
} }