hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make macro usage more like existing style

Browse source
This commit is contained in:
Cameron Hart 2016-01-02 00:09:11 +11:00
parent 7426d8d807
commit 338c494735
2 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/macros.rs
View file

@ -106,26 +106,14 @@ macro_rules! impl_operator {
let ($lhs, $rhs) = (self, other); $body let ($lhs, $rhs) = (self, other); $body
} }
} }
};
}
macro_rules! impl_scalar_ops { impl<'a> $Op<&'a $Rhs<$S>> for $Lhs {
($VectorN:ident<$S:ident> { $($field:ident),+ }) => { type Output = $Output;
impl_operator!(Add<$VectorN<$S>> for $S { #[inline]
fn add(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar + vector.$field),+) } fn $op(self, other: &'a $Rhs<$S>) -> $Output {
}); let ($lhs, $rhs) = (self, other); $body
impl_operator!(Sub<$VectorN<$S>> for $S { }
fn sub(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar - vector.$field),+) } }
});
impl_operator!(Mul<$VectorN<$S>> for $S {
fn mul(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar * vector.$field),+) }
});
impl_operator!(Div<$VectorN<$S>> for $S {
fn div(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar / vector.$field),+) }
});
impl_operator!(Rem<$VectorN<$S>> for $S {
fn rem(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar % vector.$field),+) }
});
}; };
} }

39
src/vector.rs
View file

@ -278,6 +278,19 @@ macro_rules! impl_vector {
fn rem_assign(&mut self, other) { $(self.$field %= other.$field);+ } fn rem_assign(&mut self, other) { $(self.$field %= other.$field);+ }
}); });
impl_scalar_ops!($VectorN<usize> { $($field),+ });
impl_scalar_ops!($VectorN<u8> { $($field),+ });
impl_scalar_ops!($VectorN<u16> { $($field),+ });
impl_scalar_ops!($VectorN<u32> { $($field),+ });
impl_scalar_ops!($VectorN<u64> { $($field),+ });
impl_scalar_ops!($VectorN<isize> { $($field),+ });
impl_scalar_ops!($VectorN<i8> { $($field),+ });
impl_scalar_ops!($VectorN<i16> { $($field),+ });
impl_scalar_ops!($VectorN<i32> { $($field),+ });
impl_scalar_ops!($VectorN<i64> { $($field),+ });
impl_scalar_ops!($VectorN<f32> { $($field),+ });
impl_scalar_ops!($VectorN<f64> { $($field),+ });
impl_index_operators!($VectorN<S>, $n, S, usize); impl_index_operators!($VectorN<S>, $n, S, usize);
impl_index_operators!($VectorN<S>, $n, [S], Range<usize>); impl_index_operators!($VectorN<S>, $n, [S], Range<usize>);
impl_index_operators!($VectorN<S>, $n, [S], RangeTo<usize>); impl_index_operators!($VectorN<S>, $n, [S], RangeTo<usize>);
@ -286,20 +299,30 @@ macro_rules! impl_vector {
} }
} }
macro_rules! impl_vector_scalar_ops { macro_rules! impl_scalar_ops {
($($S:ident)*) => ($( ($VectorN:ident<$S:ident> { $($field:ident),+ }) => {
impl_scalar_ops!(Vector2<$S> { x, y }); impl_operator!(Add<$VectorN<$S>> for $S {
impl_scalar_ops!(Vector3<$S> { x, y, z }); fn add(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar + vector.$field),+) }
impl_scalar_ops!(Vector4<$S> { x, y, z, w }); });
)*) impl_operator!(Sub<$VectorN<$S>> for $S {
fn sub(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar - vector.$field),+) }
});
impl_operator!(Mul<$VectorN<$S>> for $S {
fn mul(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar * vector.$field),+) }
});
impl_operator!(Div<$VectorN<$S>> for $S {
fn div(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar / vector.$field),+) }
});
impl_operator!(Rem<$VectorN<$S>> for $S {
fn rem(scalar, vector) -> $VectorN<$S> { $VectorN::new($(scalar % vector.$field),+) }
});
};
} }
impl_vector!(Vector2<S> { x, y }, 2, vec2); impl_vector!(Vector2<S> { x, y }, 2, vec2);
impl_vector!(Vector3<S> { x, y, z }, 3, vec3); impl_vector!(Vector3<S> { x, y, z }, 3, vec3);
impl_vector!(Vector4<S> { x, y, z, w }, 4, vec4); impl_vector!(Vector4<S> { x, y, z, w }, 4, vec4);
impl_vector_scalar_ops!(usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64);
impl_fixed_array_conversions!(Vector2<S> { x: 0, y: 1 }, 2); impl_fixed_array_conversions!(Vector2<S> { x: 0, y: 1 }, 2);
impl_fixed_array_conversions!(Vector3<S> { x: 0, y: 1, z: 2 }, 3); impl_fixed_array_conversions!(Vector3<S> { x: 0, y: 1, z: 2 }, 3);
impl_fixed_array_conversions!(Vector4<S> { x: 0, y: 1, z: 2, w: 3 }, 4); impl_fixed_array_conversions!(Vector4<S> { x: 0, y: 1, z: 2, w: 3 }, 4);