1 files changed, 86 insertions, 4 deletions

diff --git a/ecs/src/util.rs b/ecs/src/util.rs
index 9ab4dc6..27e9748 100644
--- a/ecs/src/util.rs
+++ b/ecs/src/util.rs
@@ -8,20 +8,20 @@ pub(crate) mod array_vec;
 
 pub trait VecExt<Item>
 {
-    fn insert_at_partition_point_by_key<Key>(
+    fn insert_at_part_pt_by_key<Key>(
         &mut self,
         item: Item,
-        func: impl FnMut(&Item) -> Key,
+        func: impl FnMut(&Item) -> &Key,
     ) where
         Key: Ord;
 }
 
 impl<Item> VecExt<Item> for Vec<Item>
 {
-    fn insert_at_partition_point_by_key<Key>(
+    fn insert_at_part_pt_by_key<Key>(
         &mut self,
         item: Item,
-        mut func: impl FnMut(&Item) -> Key,
+        mut func: impl FnMut(&Item) -> &Key,
     ) where
         Key: Ord,
     {
@@ -300,6 +300,88 @@ macro_rules! gen_mask_64 {
 
 pub(crate) use gen_mask_64;
 
+macro_rules! impl_multiple {
+    (
+        $type: ident,
+        ($(
+            impl$(<$($generic: tt$(: $bound: ident)?),*>)?
+            _<$($lt_param: lifetime),*><$($type_param: ty),*>
+            $(($($extra_cb_arg: expr),*))?
+        ),*)
+        cb=(
+            type_params=($($ty_param_matcher: ident),*)
+            $(, $($extra_matcher: ident),+)?
+        ) => {
+            $($item_tt: tt)*
+        }
+    ) => {
+        const _: () = {
+            $crate::util::impl_multiple!(
+                @(make_gen_item_macro)
+                _gen_multiple_impl_item,
+                ($($ty_param_matcher),*),
+                ($($($extra_matcher),+)?),
+                ($($item_tt)*)
+            );
+
+            $(
+                impl $(<$($generic$(: $bound)?,)*>)? $type<$($lt_param,)* $($type_param),*>
+                {
+                    _gen_multiple_impl_item!(
+                        type_params=($($type_param),*),
+                        $($($extra_cb_arg),*)?
+                    );
+                }
+            )*
+        };
+    };
+
+    (
+        @(make_gen_item_macro)
+        $name: ident,
+        ($($ty_param_matcher: ident),*),
+        ($($extra_matcher: ident),*),
+        ($($transcriber: tt)*)
+    ) => {
+        $crate::util::impl_multiple!(
+            @(make_gen_item_macro)
+            ($),
+            $name,
+            ($($ty_param_matcher),*),
+            ($($extra_matcher),*),
+            ($($transcriber)*)
+        );
+    };
+
+    (
+        @(make_gen_item_macro)
+        ($dollar: tt),
+        $name: ident,
+        ($($ty_param_matcher: ident),*),
+        ($($extra_matcher: ident),*),
+        ($($transcriber: tt)*)
+    ) => {
+        $crate::util::impl_multiple!(
+            @(make_gen_item_macro)
+            $name,
+            (
+                type_params=($($dollar$ty_param_matcher: ty),*),
+                $($dollar$extra_matcher: expr),*
+            ) => {
+                $($transcriber)*
+            }
+        );
+    };
+
+    (@(make_gen_item_macro) $name: ident, $($rule: tt)*) => {
+        macro_rules! $name {
+            $($rule)*
+        }
+    };
+}
+
+pub(crate) use impl_multiple;
+
 mod sealed
 {
     pub trait Sealed {}