From d3c4d530b6f9ce0d37d956c8ab2b4e93da6f8c0b Mon Sep 17 00:00:00 2001 From: Quaternions Date: Mon, 9 Sep 2024 13:00:51 -0700 Subject: [PATCH] refactor macros, move things around --- fixed_wide/src/fixed.rs | 154 +++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 87 deletions(-) diff --git a/fixed_wide/src/fixed.rs b/fixed_wide/src/fixed.rs index ee7662e..c754857 100644 --- a/fixed_wide/src/fixed.rs +++ b/fixed_wide/src/fixed.rs @@ -70,6 +70,15 @@ impl std::ops::Neg for Fixed{ Self::from_bits(self.bits.neg()) } } +impl std::iter::Sum for Fixed{ + fn sum>(iter:I)->Self{ + let mut sum=Self::ZERO; + for elem in iter{ + sum+=elem; + } + sum + } +} macro_rules! impl_additive_operator { ( $struct: ident, $trait: ident, $method: ident, $output: ty ) => { @@ -126,8 +135,8 @@ impl_additive_operator!( Fixed, BitOr, bitor, Self ); impl_additive_assign_operator!( Fixed, BitXorAssign, bitxor_assign ); impl_additive_operator!( Fixed, BitXor, bitxor, Self ); -macro_rules! impl_multiply_operator_const { - ( $width:expr, $struct: ident, $trait: ident, $method: ident, $output: ty ) => { +macro_rules! impl_multiply_operator_not_const_generic { + ( ($struct: ident, $trait: ident, $method: ident, $output: ty ), $width:expr ) => { impl core::ops::$trait for $struct<$width,F>{ type Output = $output; @@ -140,8 +149,8 @@ macro_rules! impl_multiply_operator_const { } }; } -macro_rules! impl_multiply_assign_operator_const { - ( $width:expr, $struct: ident, $trait: ident, $method: ident ) => { +macro_rules! impl_multiply_assign_operator_not_const_generic { + ( ($struct: ident, $trait: ident, $method: ident ), $width:expr ) => { impl core::ops::$trait for $struct<$width,F>{ fn $method(&mut self, other: Self) { self.bits.$method(other.bits); @@ -150,8 +159,8 @@ macro_rules! impl_multiply_assign_operator_const { }; } -macro_rules! impl_divide_operator_const { - ( $width:expr, $struct: ident, $trait: ident, $method: ident, $output: ty ) => { +macro_rules! impl_divide_operator_not_const_generic { + ( ($struct: ident, $trait: ident, $method: ident, $output: ty ), $width:expr ) => { impl core::ops::$trait for $struct<$width,F>{ type Output = $output; @@ -165,8 +174,8 @@ macro_rules! impl_divide_operator_const { } }; } -macro_rules! impl_divide_assign_operator_const { - ( $width:expr, $struct: ident, $trait: ident, $method: ident ) => { +macro_rules! impl_divide_assign_operator_not_const_generic { + ( ($struct: ident, $trait: ident, $method: ident ), $width:expr ) => { impl core::ops::$trait for $struct<$width,F>{ fn $method(&mut self, other: Self) { self.bits.$method(other.bits); @@ -201,61 +210,29 @@ macro_rules! impl_multiplicatave_assign_operator { } }; } -impl std::iter::Sum for Fixed{ - fn sum>(iter:I)->Self{ - let mut sum=Self::ZERO; - for elem in iter{ - sum+=elem; - } - sum + +macro_rules! macro_repeated{ + ( + $macro:ident, + $any:tt, + $($repeated:tt),* + )=>{ + $( + $macro!($any, $repeated); + )* + }; +} + +macro_rules! macro_16 { + ( $macro: ident, $any:tt ) => { + macro_repeated!($macro,$any,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16); } } -macro_rules! impl_operator_16 { - ( $macro: ident, $struct: ident, $trait: ident, $method: ident, $output: ty ) => { - $macro!(1,$struct,$trait,$method,$output); - $macro!(2,$struct,$trait,$method,$output); - $macro!(3,$struct,$trait,$method,$output); - $macro!(4,$struct,$trait,$method,$output); - $macro!(5,$struct,$trait,$method,$output); - $macro!(6,$struct,$trait,$method,$output); - $macro!(7,$struct,$trait,$method,$output); - $macro!(8,$struct,$trait,$method,$output); - $macro!(9,$struct,$trait,$method,$output); - $macro!(10,$struct,$trait,$method,$output); - $macro!(11,$struct,$trait,$method,$output); - $macro!(12,$struct,$trait,$method,$output); - $macro!(13,$struct,$trait,$method,$output); - $macro!(14,$struct,$trait,$method,$output); - $macro!(15,$struct,$trait,$method,$output); - $macro!(16,$struct,$trait,$method,$output); - } -} -macro_rules! impl_assign_operator_16 { - ( $macro: ident, $struct: ident, $trait: ident, $method: ident ) => { - $macro!(1,$struct,$trait,$method); - $macro!(2,$struct,$trait,$method); - $macro!(3,$struct,$trait,$method); - $macro!(4,$struct,$trait,$method); - $macro!(5,$struct,$trait,$method); - $macro!(6,$struct,$trait,$method); - $macro!(7,$struct,$trait,$method); - $macro!(8,$struct,$trait,$method); - $macro!(9,$struct,$trait,$method); - $macro!(10,$struct,$trait,$method); - $macro!(11,$struct,$trait,$method); - $macro!(12,$struct,$trait,$method); - $macro!(13,$struct,$trait,$method); - $macro!(14,$struct,$trait,$method); - $macro!(15,$struct,$trait,$method); - $macro!(16,$struct,$trait,$method); - } -} - -impl_assign_operator_16!( impl_multiply_assign_operator_const, Fixed, MulAssign, mul_assign ); -impl_operator_16!( impl_multiply_operator_const, Fixed, Mul, mul, Self ); -impl_assign_operator_16!( impl_divide_assign_operator_const, Fixed, DivAssign, div_assign ); -impl_operator_16!( impl_divide_operator_const, Fixed, Div, div, Self ); +macro_16!( impl_multiply_assign_operator_not_const_generic, (Fixed, MulAssign, mul_assign) ); +macro_16!( impl_multiply_operator_not_const_generic, (Fixed, Mul, mul, Self) ); +macro_16!( impl_divide_assign_operator_not_const_generic, (Fixed, DivAssign, div_assign) ); +macro_16!( impl_divide_operator_not_const_generic, (Fixed, Div, div, Self) ); impl_multiplicatave_assign_operator!( Fixed, MulAssign, mul_assign ); impl_multiplicatave_operator!( Fixed, Mul, mul, Self ); impl_multiplicatave_assign_operator!( Fixed, DivAssign, div_assign ); @@ -290,7 +267,10 @@ impl_shift_operator!( Fixed, Shr, shr, Self ); // let a = I32F32::ONE; // let b:I64F64 = a.wide_mul(a); macro_rules! impl_wide_mul{ - ($lhs:expr,$rhs:expr)=>{ + ( + (), + ($lhs:expr,$rhs:expr) + )=>{ impl Fixed<$lhs,{$lhs*32}> { paste::item!{ @@ -302,24 +282,24 @@ macro_rules! impl_wide_mul{ }; } -macro_rules! impl_wide_mul_all{ - ($(($x:expr, $y:expr)),*)=>{ - $( - impl_wide_mul!($x, $y); - )* - }; -} - //const generics sidestepped wahoo -impl_wide_mul_all!( - (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1), - (1,2),(2,2),(3,2),(4,2),(5,2),(6,2),(7,2),(8,2), - (1,3),(2,3),(3,3),(4,3),(5,3),(6,3),(7,3),(8,3), - (1,4),(2,4),(3,4),(4,4),(5,4),(6,4),(7,4),(8,4), - (1,5),(2,5),(3,5),(4,5),(5,5),(6,5),(7,5),(8,5), - (1,6),(2,6),(3,6),(4,6),(5,6),(6,6),(7,6),(8,6), - (1,7),(2,7),(3,7),(4,7),(5,7),(6,7),(7,7),(8,7), - (1,8),(2,8),(3,8),(4,8),(5,8),(6,8),(7,8),(8,8) +macro_repeated!( + impl_wide_mul,(), + (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1),(11,1),(12,1),(13,1),(14,1),(15,1), + (1,2),(2,2),(3,2),(4,2),(5,2),(6,2),(7,2),(8,2),(9,2),(10,2),(11,2),(12,2),(13,2),(14,2), + (1,3),(2,3),(3,3),(4,3),(5,3),(6,3),(7,3),(8,3),(9,3),(10,3),(11,3),(12,3),(13,3), + (1,4),(2,4),(3,4),(4,4),(5,4),(6,4),(7,4),(8,4),(9,4),(10,4),(11,4),(12,4), + (1,5),(2,5),(3,5),(4,5),(5,5),(6,5),(7,5),(8,5),(9,5),(10,5),(11,5), + (1,6),(2,6),(3,6),(4,6),(5,6),(6,6),(7,6),(8,6),(9,6),(10,6), + (1,7),(2,7),(3,7),(4,7),(5,7),(6,7),(7,7),(8,7),(9,7), + (1,8),(2,8),(3,8),(4,8),(5,8),(6,8),(7,8),(8,8), + (1,9),(2,9),(3,9),(4,9),(5,9),(6,9),(7,9), + (1,10),(2,10),(3,10),(4,10),(5,10),(6,10), + (1,11),(2,11),(3,11),(4,11),(5,11), + (1,12),(2,12),(3,12),(4,12), + (1,13),(2,13),(3,13), + (1,14),(2,14), + (1,15) ); impl Fixed{ pub fn resize_into(self)->Fixed{ @@ -327,7 +307,7 @@ impl Fixed{ } } -macro_rules! impl_const{ +macro_rules! impl_not_const_generic{ ($n:expr)=>{ impl Fixed<{$n*2},{$n*2*32}>{ pub fn halve_precision(self)->Fixed<$n,{$n*32}>{ @@ -376,11 +356,11 @@ macro_rules! impl_const{ } } } -impl_const!(1); -impl_const!(2); -impl_const!(3); -impl_const!(4); -impl_const!(5); -impl_const!(6); -impl_const!(7); -impl_const!(8); +impl_not_const_generic!(1); +impl_not_const_generic!(2); +impl_not_const_generic!(3); +impl_not_const_generic!(4); +impl_not_const_generic!(5); +impl_not_const_generic!(6); +impl_not_const_generic!(7); +impl_not_const_generic!(8);