From 51a4e73386ac26904ba2a7841e4ef8c427215020 Mon Sep 17 00:00:00 2001
From: sebcrozet <developer@crozet.re>
Date: Mon, 24 Sep 2018 21:11:37 +0200
Subject: [PATCH] Use typenum type-level integer for swizzle dimension
 comparison.

Fix #408.
---
 src/base/swizzle.rs  |  8 +++----
 tests/core/matrix.rs | 55 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/base/swizzle.rs b/src/base/swizzle.rs
index eaf8b9ff..e4ae9c9c 100644
--- a/src/base/swizzle.rs
+++ b/src/base/swizzle.rs
@@ -1,16 +1,16 @@
-use base::{Scalar, Vector, DimName, U0, U1, U2, Vector2, Vector3};
+use base::{Scalar, Vector, DimName, Vector2, Vector3};
 use storage::Storage;
-use typenum::{Cmp, Greater};
+use typenum::{self, Cmp, Greater};
 
 
 macro_rules! impl_swizzle {
-    ($(where $BaseDim: ty: $name: ident() -> $Result: ident[$($i: expr),*]);*) => {
+    ($(where $BaseDim: ident: $name: ident() -> $Result: ident[$($i: expr),*]);*) => {
         $(
             impl<N: Scalar, D: DimName, S: Storage<N, D>> Vector<N, D, S> {
                 /// Builds a new vector from components of `self`.
                 #[inline]
                 pub fn $name(&self) -> $Result<N>
-                    where D::Value: Cmp<$BaseDim, Output=Greater> {
+                    where D::Value: Cmp<typenum::$BaseDim, Output=Greater> {
                     $Result::new($(self[$i]),*)
                 }
             }
diff --git a/tests/core/matrix.rs b/tests/core/matrix.rs
index e0a552ee..34ecaad7 100644
--- a/tests/core/matrix.rs
+++ b/tests/core/matrix.rs
@@ -716,6 +716,61 @@ fn partial_clamp() {
     assert_eq!(*inter.unwrap(), n);
 }
 
+fn swizzle() {
+    let a = Vector2::new(1.0f32, 2.0);
+    let b = Vector3::new(1.0f32, 2.0, 3.0);
+    let c = Vector4::new(1.0f32, 2.0, 3.0, 4.0);
+
+    assert_eq!(a.xy(), Vector2::new(1.0, 2.0));
+    assert_eq!(a.yx(), Vector2::new(2.0, 1.0));
+    assert_eq!(a.xx(), Vector2::new(1.0, 1.0));
+    assert_eq!(a.yy(), Vector2::new(2.0, 2.0));
+
+    assert_eq!(a.xxx(), Vector3::new(1.0, 1.0, 1.0));
+    assert_eq!(a.yyy(), Vector3::new(2.0, 2.0, 2.0));
+    assert_eq!(a.xyx(), Vector3::new(1.0, 2.0, 1.0));
+    assert_eq!(a.yxy(), Vector3::new(2.0, 1.0, 2.0));
+
+    assert_eq!(b.xy(), Vector2::new(1.0, 2.0));
+    assert_eq!(b.yx(), Vector2::new(2.0, 1.0));
+    assert_eq!(b.xx(), Vector2::new(1.0, 1.0));
+    assert_eq!(b.yy(), Vector2::new(2.0, 2.0));
+
+    assert_eq!(b.xz(), Vector2::new(1.0, 3.0));
+    assert_eq!(b.zx(), Vector2::new(3.0, 1.0));
+    assert_eq!(b.yz(), Vector2::new(2.0, 3.0));
+    assert_eq!(b.zy(), Vector2::new(3.0, 2.0));
+    assert_eq!(b.zz(), Vector2::new(3.0, 3.0));
+
+    assert_eq!(b.xyz(), Vector3::new(1.0, 2.0, 3.0));
+    assert_eq!(b.xxx(), Vector3::new(1.0, 1.0, 1.0));
+    assert_eq!(b.yyy(), Vector3::new(2.0, 2.0, 2.0));
+    assert_eq!(b.zzz(), Vector3::new(3.0, 3.0, 3.0));
+    assert_eq!(b.zxy(), Vector3::new(3.0, 1.0, 2.0));
+    assert_eq!(b.zxz(), Vector3::new(3.0, 1.0, 3.0));
+    assert_eq!(b.zyz(), Vector3::new(3.0, 2.0, 3.0));
+
+
+    assert_eq!(c.xy(), Vector2::new(1.0, 2.0));
+    assert_eq!(c.yx(), Vector2::new(2.0, 1.0));
+    assert_eq!(c.xx(), Vector2::new(1.0, 1.0));
+    assert_eq!(c.yy(), Vector2::new(2.0, 2.0));
+
+    assert_eq!(c.xz(), Vector2::new(1.0, 3.0));
+    assert_eq!(c.zx(), Vector2::new(3.0, 1.0));
+    assert_eq!(c.yz(), Vector2::new(2.0, 3.0));
+    assert_eq!(c.zy(), Vector2::new(3.0, 2.0));
+    assert_eq!(c.zz(), Vector2::new(3.0, 3.0));
+
+    assert_eq!(c.xyz(), Vector3::new(1.0, 2.0, 3.0));
+    assert_eq!(c.xxx(), Vector3::new(1.0, 1.0, 1.0));
+    assert_eq!(c.yyy(), Vector3::new(2.0, 2.0, 2.0));
+    assert_eq!(c.zzz(), Vector3::new(3.0, 3.0, 3.0));
+    assert_eq!(c.zxy(), Vector3::new(3.0, 1.0, 2.0));
+    assert_eq!(c.zxz(), Vector3::new(3.0, 1.0, 3.0));
+    assert_eq!(c.zyz(), Vector3::new(3.0, 2.0, 3.0));
+}
+
 #[cfg(feature = "arbitrary")]
 mod transposition_tests {
     use super::*;