forked from M-Labs/nalgebra
7d99015473
This should semantically be a no-op, but enables refactorings to use non-Copy scalars on a case-by-case basis.
Also, the only instance of a `One + Zero` trait bound was changed into a `Zero + One` bound to match the others.
The following sed scripts were used in the refactoring (with each clause added to reduce the error count of `cargo check`):
```bash
export RELEVANT_SOURCEFILES="$(find src -name '*.rs') $(find examples -name '*.rs')"
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar,/N: Scalar+Copy,/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + Field/N: Scalar + Copy + Field/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + Zero/N: Scalar + Copy + Zero/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + Closed/N: Scalar + Copy + Closed/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + Eq/N: Scalar + Copy + Eq/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + PartialOrd/N: Scalar + Copy + PartialOrd/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: *Scalar + Zero/N: Scalar + Copy + Zero/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + PartialEq/N: Scalar + Copy + PartialEq/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar>/N: Scalar+Copy>/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: Scalar + $bound/N: Scalar + Copy + $bound/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: *Scalar + $bound/N: Scalar + Copy + $bound/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\): *Scalar,/N\1: Scalar+Copy,/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N: *Scalar + $trait/N: Scalar + Copy + $trait/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\): *Scalar + Superset/N\1: Scalar + Copy + Superset/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\): *Scalar + \([a-zA-Z]*Eq\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \([a-zA-Z]*Eq\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(hash::\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar {/N\1: Scalar + Copy {/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Zero\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Bounded\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Lattice\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Meet\|Join\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(fmt::\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Ring\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Hash\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Send\|Sync\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/One + Zero/Zero + One/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \(Zero\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar + \($marker\)/N\1: Scalar + Copy + \2/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/N\([0-9]\?\): *Scalar>/N\1: Scalar + Copy>/' $f; done
for f in $RELEVANT_SOURCEFILES; do sed -i 's/Scalar+Copy/Scalar + Copy/' $f; done
```
63 lines
2.2 KiB
Rust
63 lines
2.2 KiB
Rust
use crate::base::{DimName, Scalar, Vector, Vector2, Vector3};
|
|
use crate::storage::Storage;
|
|
use typenum::{self, Cmp, Greater};
|
|
|
|
macro_rules! impl_swizzle {
|
|
($( where $BaseDim: ident: $( $name: ident() -> $Result: ident[$($i: expr),+] ),+ ;)* ) => {
|
|
$(
|
|
impl<N: Scalar, D: DimName, S: Storage<N, D>> Vector<N, D, S>
|
|
where D::Value: Cmp<typenum::$BaseDim, Output=Greater>
|
|
{
|
|
$(
|
|
/// Builds a new vector from components of `self`.
|
|
#[inline]
|
|
pub fn $name(&self) -> $Result<N> {
|
|
$Result::new($(self[$i].inlined_clone()),*)
|
|
}
|
|
)*
|
|
}
|
|
)*
|
|
}
|
|
}
|
|
|
|
impl_swizzle!(
|
|
where U0: xx() -> Vector2[0, 0],
|
|
xxx() -> Vector3[0, 0, 0];
|
|
|
|
where U1: xy() -> Vector2[0, 1],
|
|
yx() -> Vector2[1, 0],
|
|
yy() -> Vector2[1, 1],
|
|
xxy() -> Vector3[0, 0, 1],
|
|
xyx() -> Vector3[0, 1, 0],
|
|
xyy() -> Vector3[0, 1, 1],
|
|
yxx() -> Vector3[1, 0, 0],
|
|
yxy() -> Vector3[1, 0, 1],
|
|
yyx() -> Vector3[1, 1, 0],
|
|
yyy() -> Vector3[1, 1, 1];
|
|
|
|
where U2: xz() -> Vector2[0, 2],
|
|
yz() -> Vector2[1, 2],
|
|
zx() -> Vector2[2, 0],
|
|
zy() -> Vector2[2, 1],
|
|
zz() -> Vector2[2, 2],
|
|
xxz() -> Vector3[0, 0, 2],
|
|
xyz() -> Vector3[0, 1, 2],
|
|
xzx() -> Vector3[0, 2, 0],
|
|
xzy() -> Vector3[0, 2, 1],
|
|
xzz() -> Vector3[0, 2, 2],
|
|
yxz() -> Vector3[1, 0, 2],
|
|
yyz() -> Vector3[1, 1, 2],
|
|
yzx() -> Vector3[1, 2, 0],
|
|
yzy() -> Vector3[1, 2, 1],
|
|
yzz() -> Vector3[1, 2, 2],
|
|
zxx() -> Vector3[2, 0, 0],
|
|
zxy() -> Vector3[2, 0, 1],
|
|
zxz() -> Vector3[2, 0, 2],
|
|
zyx() -> Vector3[2, 1, 0],
|
|
zyy() -> Vector3[2, 1, 1],
|
|
zyz() -> Vector3[2, 1, 2],
|
|
zzx() -> Vector3[2, 2, 0],
|
|
zzy() -> Vector3[2, 2, 1],
|
|
zzz() -> Vector3[2, 2, 2];
|
|
);
|