Add DimAdd trait

Author: jturner314

src/dimension/mod.rs

@@ -18,6 +18,7 @@ pub use self::dim::*;
 pub use self::dimension_trait::Dimension;
 pub use self::dynindeximpl::IxDynImpl;
 pub use self::ndindex::NdIndex;
+pub use self::ops::DimAdd;
 pub use self::remove_axis::RemoveAxis;
 
 use crate::shape_builder::Strides;
@@ -34,6 +35,7 @@ pub mod dim;
 mod dimension_trait;
 mod dynindeximpl;
 mod ndindex;
+mod ops;
 mod remove_axis;
 
 /// Calculate offset from `Ix` stride converting sign properly

src/dimension/ops.rs

@@ -0,0 +1,95 @@
+use crate::imp_prelude::*;
+
+/// Adds the two dimensions at compile time.
+pub trait DimAdd<D: Dimension>: Dimension {
+    /// The sum of the two dimensions.
+    type Out: Dimension;
+}
+
+macro_rules! impl_dimadd_const_out_const {
+    ($lhs:expr, $rhs:expr) => {
+        impl DimAdd<Dim<[usize; $rhs]>> for Dim<[usize; $lhs]> {
+            type Out = Dim<[usize; $lhs + $rhs]>;
+        }
+    };
+}
+
+macro_rules! impl_dimadd_const_out_dyn {
+    ($lhs:expr, IxDyn) => {
+        impl DimAdd<IxDyn> for Dim<[usize; $lhs]> {
+            type Out = IxDyn;
+        }
+    };
+    ($lhs:expr, $rhs:expr) => {
+        impl DimAdd<Dim<[usize; $rhs]>> for Dim<[usize; $lhs]> {
+            type Out = IxDyn;
+        }
+    };
+}
+
+impl_dimadd_const_out_const!(0, 0);
+impl_dimadd_const_out_const!(0, 1);
+impl_dimadd_const_out_const!(0, 2);
+impl_dimadd_const_out_const!(0, 3);
+impl_dimadd_const_out_const!(0, 4);
+impl_dimadd_const_out_const!(0, 5);
+impl_dimadd_const_out_const!(0, 6);
+impl_dimadd_const_out_dyn!(0, IxDyn);
+
+impl_dimadd_const_out_const!(1, 0);
+impl_dimadd_const_out_const!(1, 1);
+impl_dimadd_const_out_const!(1, 2);
+impl_dimadd_const_out_const!(1, 3);
+impl_dimadd_const_out_const!(1, 4);
+impl_dimadd_const_out_const!(1, 5);
+impl_dimadd_const_out_dyn!(1, 6);
+impl_dimadd_const_out_dyn!(1, IxDyn);
+
+impl_dimadd_const_out_const!(2, 0);
+impl_dimadd_const_out_const!(2, 1);
+impl_dimadd_const_out_const!(2, 2);
+impl_dimadd_const_out_const!(2, 3);
+impl_dimadd_const_out_const!(2, 4);
+impl_dimadd_const_out_dyn!(2, 5);
+impl_dimadd_const_out_dyn!(2, 6);
+impl_dimadd_const_out_dyn!(2, IxDyn);
+
+impl_dimadd_const_out_const!(3, 0);
+impl_dimadd_const_out_const!(3, 1);
+impl_dimadd_const_out_const!(3, 2);
+impl_dimadd_const_out_const!(3, 3);
+impl_dimadd_const_out_dyn!(3, 4);
+impl_dimadd_const_out_dyn!(3, 5);
+impl_dimadd_const_out_dyn!(3, 6);
+impl_dimadd_const_out_dyn!(3, IxDyn);
+
+impl_dimadd_const_out_const!(4, 0);
+impl_dimadd_const_out_const!(4, 1);
+impl_dimadd_const_out_const!(4, 2);
+impl_dimadd_const_out_dyn!(4, 3);
+impl_dimadd_const_out_dyn!(4, 4);
+impl_dimadd_const_out_dyn!(4, 5);
+impl_dimadd_const_out_dyn!(4, 6);
+impl_dimadd_const_out_dyn!(4, IxDyn);
+
+impl_dimadd_const_out_const!(5, 0);
+impl_dimadd_const_out_const!(5, 1);
+impl_dimadd_const_out_dyn!(5, 2);
+impl_dimadd_const_out_dyn!(5, 3);
+impl_dimadd_const_out_dyn!(5, 4);
+impl_dimadd_const_out_dyn!(5, 5);
+impl_dimadd_const_out_dyn!(5, 6);
+impl_dimadd_const_out_dyn!(5, IxDyn);
+
+impl_dimadd_const_out_const!(6, 0);
+impl_dimadd_const_out_dyn!(6, 1);
+impl_dimadd_const_out_dyn!(6, 2);
+impl_dimadd_const_out_dyn!(6, 3);
+impl_dimadd_const_out_dyn!(6, 4);
+impl_dimadd_const_out_dyn!(6, 5);
+impl_dimadd_const_out_dyn!(6, 6);
+impl_dimadd_const_out_dyn!(6, IxDyn);
+
+impl<D: Dimension> DimAdd<D> for IxDyn {
+    type Out = IxDyn;
+}

src/lib.rs

@@ -134,7 +134,7 @@ use std::marker::PhantomData;
 use alloc::sync::Arc;
 
 pub use crate::dimension::dim::*;
-pub use crate::dimension::{Axis, AxisDescription, Dimension, IntoDimension, RemoveAxis};
+pub use crate::dimension::{Axis, AxisDescription, DimAdd, Dimension, IntoDimension, RemoveAxis};
 
 pub use crate::dimension::IxDynImpl;
 pub use crate::dimension::NdIndex;