From 39b065b7b3c82218f7be5876f563b5d74ea75ee3 Mon Sep 17 00:00:00 2001 From: Mel Date: Sat, 23 Oct 2021 00:46:02 +0200 Subject: Simplify parser macros --- src/parse/macros.rs | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/parse/macros.rs b/src/parse/macros.rs index 0b09152..156bdb8 100644 --- a/src/parse/macros.rs +++ b/src/parse/macros.rs @@ -1,12 +1,8 @@ #[macro_export] macro_rules! check { ($self:ident, $($variant:pat_param)|+) => { - if let Some(token) = $self.tokens.peek() { - if let Token {variant: $( $variant )|+, ..} = token { - true - } else { - false - } + if let Some(Token {variant: $( $variant )|+, ..}) = $self.tokens.peek() { + true } else { false } @@ -36,12 +32,8 @@ macro_rules! consume { #[macro_export] macro_rules! consume_if { ($self:ident, $($variant:pat_param)|+) => { - if let Some(token) = $self.tokens.peek() { - if let Token {variant: $( $variant )|+, ..} = token { - Some($self.tokens.next().unwrap()) - } else { - None - } + if let Some(Token {variant: $( $variant )|+, ..}) = $self.tokens.peek() { + Some($self.tokens.next().unwrap()) } else { None } @@ -53,7 +45,7 @@ macro_rules! inner { ($token:expr, $variant:path ) => { match $token.variant { $variant(inner) => inner, - _ => panic!("Tried getting inner content of incorrect variant.") + _ => panic!("Tried getting inner content of incorrect variant."), } }; -} \ No newline at end of file +} -- cgit 1.4.1