diff options
Diffstat (limited to 'src/libextra/num/bigint.rs')
| -rw-r--r-- | src/libextra/num/bigint.rs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs index 46a74457274..453ad857a05 100644 --- a/src/libextra/num/bigint.rs +++ b/src/libextra/num/bigint.rs @@ -131,7 +131,7 @@ impl TotalOrd for BigUint { if s_len < o_len { return Less; } if s_len > o_len { return Greater; } - for self.data.rev_iter().zip(other.data.rev_iter()).advance |(&self_i, &other_i)| { + foreach (&self_i, &other_i) in self.data.rev_iter().zip(other.data.rev_iter()) { cond!((self_i < other_i) { return Less; } (self_i > other_i) { return Greater; }) } @@ -420,7 +420,7 @@ impl Integer for BigUint { let bn = *b.data.last(); let mut d = ~[]; let mut carry = 0; - for an.rev_iter().advance |elt| { + foreach elt in an.rev_iter() { let ai = BigDigit::to_uint(carry, *elt); let di = ai / (bn as uint); assert!(di < BigDigit::base); @@ -524,7 +524,7 @@ impl ToStrRadix for BigUint { fn fill_concat(v: &[BigDigit], radix: uint, l: uint) -> ~str { if v.is_empty() { return ~"0" } let mut s = str::with_capacity(v.len() * l); - for v.rev_iter().advance |n| { + foreach n in v.rev_iter() { let ss = uint::to_str_radix(*n as uint, radix); s.push_str("0".repeat(l - ss.len())); s.push_str(ss); @@ -651,7 +651,7 @@ impl BigUint { let mut borrow = 0; let mut shifted = ~[]; - for self.data.rev_iter().advance |elem| { + foreach elem in self.data.rev_iter() { shifted = ~[(*elem >> n_bits) | borrow] + shifted; borrow = *elem << (BigDigit::bits - n_bits); } @@ -1186,8 +1186,8 @@ mod biguint_tests { fn test_cmp() { let data: ~[BigUint] = [ &[], &[1], &[2], &[-1], &[0, 1], &[2, 1], &[1, 1, 1] ] .map(|v| BigUint::from_slice(*v)); - for data.iter().enumerate().advance |(i, ni)| { - for data.slice(i, data.len()).iter().enumerate().advance |(j0, nj)| { + foreach (i, ni) in data.iter().enumerate() { + foreach (j0, nj) in data.slice(i, data.len()).iter().enumerate() { let j = j0 + i; if i == j { assert_eq!(ni.cmp(nj), Equal); @@ -1360,7 +1360,7 @@ mod biguint_tests { #[test] fn test_add() { - for sum_triples.iter().advance |elm| { + foreach elm in sum_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigUint::from_slice(aVec); let b = BigUint::from_slice(bVec); @@ -1373,7 +1373,7 @@ mod biguint_tests { #[test] fn test_sub() { - for sum_triples.iter().advance |elm| { + foreach elm in sum_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigUint::from_slice(aVec); let b = BigUint::from_slice(bVec); @@ -1424,7 +1424,7 @@ mod biguint_tests { #[test] fn test_mul() { - for mul_triples.iter().advance |elm| { + foreach elm in mul_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigUint::from_slice(aVec); let b = BigUint::from_slice(bVec); @@ -1434,7 +1434,7 @@ mod biguint_tests { assert!(b * a == c); } - for div_rem_quadruples.iter().advance |elm| { + foreach elm in div_rem_quadruples.iter() { let (aVec, bVec, cVec, dVec) = *elm; let a = BigUint::from_slice(aVec); let b = BigUint::from_slice(bVec); @@ -1448,7 +1448,7 @@ mod biguint_tests { #[test] fn test_div_rem() { - for mul_triples.iter().advance |elm| { + foreach elm in mul_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigUint::from_slice(aVec); let b = BigUint::from_slice(bVec); @@ -1462,7 +1462,7 @@ mod biguint_tests { } } - for div_rem_quadruples.iter().advance |elm| { + foreach elm in div_rem_quadruples.iter() { let (aVec, bVec, cVec, dVec) = *elm; let a = BigUint::from_slice(aVec); let b = BigUint::from_slice(bVec); @@ -1579,9 +1579,9 @@ mod biguint_tests { #[test] fn test_to_str_radix() { let r = to_str_pairs(); - for r.iter().advance |num_pair| { + foreach num_pair in r.iter() { let &(ref n, ref rs) = num_pair; - for rs.iter().advance |str_pair| { + foreach str_pair in rs.iter() { let &(ref radix, ref str) = str_pair; assert_eq!(&n.to_str_radix(*radix), str); } @@ -1591,9 +1591,9 @@ mod biguint_tests { #[test] fn test_from_str_radix() { let r = to_str_pairs(); - for r.iter().advance |num_pair| { + foreach num_pair in r.iter() { let &(ref n, ref rs) = num_pair; - for rs.iter().advance |str_pair| { + foreach str_pair in rs.iter() { let &(ref radix, ref str) = str_pair; assert_eq!(n, &FromStrRadix::from_str_radix(*str, *radix).get()); } @@ -1658,14 +1658,14 @@ mod bigint_tests { fn test_cmp() { let vs = [ &[2 as BigDigit], &[1, 1], &[2, 1], &[1, 1, 1] ]; let mut nums = ~[]; - for vs.rev_iter().advance |s| { + foreach s in vs.rev_iter() { nums.push(BigInt::from_slice(Minus, *s)); } nums.push(Zero::zero()); nums.push_all_move(vs.map(|s| BigInt::from_slice(Plus, *s))); - for nums.iter().enumerate().advance |(i, ni)| { - for nums.slice(i, nums.len()).iter().enumerate().advance |(j0, nj)| { + foreach (i, ni) in nums.iter().enumerate() { + foreach (j0, nj) in nums.slice(i, nums.len()).iter().enumerate() { let j = i + j0; if i == j { assert_eq!(ni.cmp(nj), Equal); @@ -1769,7 +1769,7 @@ mod bigint_tests { #[test] fn test_add() { - for sum_triples.iter().advance |elm| { + foreach elm in sum_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1788,7 +1788,7 @@ mod bigint_tests { #[test] fn test_sub() { - for sum_triples.iter().advance |elm| { + foreach elm in sum_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1845,7 +1845,7 @@ mod bigint_tests { #[test] fn test_mul() { - for mul_triples.iter().advance |elm| { + foreach elm in mul_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1858,7 +1858,7 @@ mod bigint_tests { assert!((-b) * a == -c); } - for div_rem_quadruples.iter().advance |elm| { + foreach elm in div_rem_quadruples.iter() { let (aVec, bVec, cVec, dVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1897,7 +1897,7 @@ mod bigint_tests { } } - for mul_triples.iter().advance |elm| { + foreach elm in mul_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1907,7 +1907,7 @@ mod bigint_tests { if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); } } - for div_rem_quadruples.iter().advance |elm| { + foreach elm in div_rem_quadruples.iter() { let (aVec, bVec, cVec, dVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1940,7 +1940,7 @@ mod bigint_tests { check_sub(&a.neg(), b, &q.neg(), &r.neg()); check_sub(&a.neg(), &b.neg(), q, &r.neg()); } - for mul_triples.iter().advance |elm| { + foreach elm in mul_triples.iter() { let (aVec, bVec, cVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); @@ -1950,7 +1950,7 @@ mod bigint_tests { if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); } } - for div_rem_quadruples.iter().advance |elm| { + foreach elm in div_rem_quadruples.iter() { let (aVec, bVec, cVec, dVec) = *elm; let a = BigInt::from_slice(Plus, aVec); let b = BigInt::from_slice(Plus, bVec); |
