From 4c8e1445c1849aa7e37ab115c7c79c331c6ce492 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Fri, 20 Sep 2013 02:43:33 +1000 Subject: [PATCH] Fix bug with macro expansion --- src/cgmath/array.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cgmath/array.rs b/src/cgmath/array.rs index 6357471..6e06df9 100644 --- a/src/cgmath/array.rs +++ b/src/cgmath/array.rs @@ -106,21 +106,21 @@ pub fn build>(builder: &fn(i: uint) -> T) -> } macro_rules! gen_builder( - (_2) => ([builder(0), builder(1)]); - (_3) => ([builder(0), builder(1), builder(2)]); - (_4) => ([builder(0), builder(1), builder(2), builder(3)]); + (_2) => ({ [builder(0), builder(1)] }); + (_3) => ({ [builder(0), builder(1), builder(2)] }); + (_4) => ({ [builder(0), builder(1), builder(2), builder(3)] }); ) macro_rules! gen_fold( - (_2) => (f(self.i(0), self.i(1))); - (_3) => (f(&f(self.i(0), self.i(1)), self.i(2))); - (_4) => (f(&f(&f(self.i(0), self.i(1)), self.i(2)), self.i(3))); + (_2) => ({ f(self.i(0), self.i(1)) }); + (_3) => ({ f(&f(self.i(0), self.i(1)), self.i(2)) }); + (_4) => ({ f(&f(&f(self.i(0), self.i(1)), self.i(2)), self.i(3)) }); ) macro_rules! gen_each_mut( - (_2) => (f(0, self.mut_i(0)); f(1, self.mut_i(1));); - (_3) => (f(0, self.mut_i(0)); f(1, self.mut_i(1)); f(2, self.mut_i(2));); - (_4) => (f(0, self.mut_i(0)); f(1, self.mut_i(1)); f(2, self.mut_i(2)); f(3, self.mut_i(3));); + (_2) => ({ f(0, self.mut_i(0)); f(1, self.mut_i(1)); }); + (_3) => ({ f(0, self.mut_i(0)); f(1, self.mut_i(1)); f(2, self.mut_i(2)); }); + (_4) => ({ f(0, self.mut_i(0)); f(1, self.mut_i(1)); f(2, self.mut_i(2)); f(3, self.mut_i(3)); }); ) macro_rules! approx_eq(