fix(macros): use structure! macro inside of body! macro

This avoids the definition of duplicated match pattern which would need to be kept in sync otherwise.
martinohmann · Jun 12, 2022 · 1d9a00c · 1d9a00c
1 parent 0661eba
commit 1d9a00c
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -120,7 +120,7 @@ macro_rules! body_internal {
 
     // Next element is an attribute, munch into elems and proceed with next structure.
     (@structures [$(($elems:expr))*] $key:tt = $expr:tt $($rest:tt)*) => {
-        $crate::body_internal!(@structures [$(($elems))* ($crate::body_internal!(@attribute $key = $expr))] $($rest)*)
+        $crate::body_internal!(@structures [$(($elems))* ($crate::structure!($key = $expr))] $($rest)*)
     };
 
     // Next element must be a block, invoke block muncher.
@@ -131,12 +131,12 @@ macro_rules! body_internal {
     //////////////////////////////////////////////////////////////////////////
     // TT muncher for parsing an HCL block.
     //
-    // Must be invoked as: body_internal!(@block [$(($elems))*] $ident $($rest)*)
+    // Must be invoked as: body_internal!(@block [$(($elems))*] $ident $($rest)+)
     //////////////////////////////////////////////////////////////////////////
 
     // Found block body, munch block into elems and proceed with next structure.
     (@block [$(($elems:expr))*] ($ident:expr) [$(($labels:expr))*] { $($body:tt)* } $($rest:tt)*) => {
-        $crate::body_internal!(@structures [$(($elems))* ($crate::body_internal!(@block ($ident) [$(($labels))*] { $($body)* }))] $($rest)*)
+        $crate::body_internal!(@structures [$(($elems))* ($crate::structure!(($ident) [$(($labels))*] { $($body)* }))] $($rest)*)
     };
 
     // Munch an identifier block label.
@@ -170,16 +170,6 @@ macro_rules! body_internal {
     // Must be invoked as: body_internal!($($tt)+)
     //////////////////////////////////////////////////////////////////////////
 
-    // Attribute structure.
-    (@attribute $key:tt = $expr:tt) => {
-        $crate::Structure::Attribute($crate::attribute!($key = $expr))
-    };
-
-    // Block structure.
-    (@block ($ident:expr) [$(($labels:expr))*] { $($body:tt)* }) => {
-        $crate::Structure::Block($crate::block!(($ident) [$(($labels))*] { $($body)* }))
-    };
-
     // Body in curly braces.
     ({ $($tt:tt)* }) => {
         $crate::body_internal!($($tt)*)