OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use parentheses for cond! macro instead of preceding pipes

Browse Source 
This is temporary. Once the macro parser has improved or been re-written these can be removed.
This commit is contained in:
Brendan Zabarauskas 2013-05-10 15:01:27 +10:00
parent b9824e18c2
commit 7e4a176dd3
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/fun_treemap.rs
View File

@ -37,8 +37,8 @@ pub fn insert<K:Copy + Eq + Ord,V:Copy>(m: Treemap<K, V>, k: K, v: V) -> Treemap
@match m {
@Empty => Node(@k, @v, @Empty, @Empty),
@Node(@copy kk, vv, left, right) => cond!(
| k < kk { Node(@kk, vv, insert(left, k, v), right) }
| k == kk { Node(@kk, @v, left, right) }
(k < kk) { Node(@kk, vv, insert(left, k, v), right) }
(k == kk) { Node(@kk, @v, left, right) }
_ { Node(@kk, vv, left, insert(right, k, v)) }
)
}
@ -49,8 +49,8 @@ pub fn find<K:Eq + Ord,V:Copy>(m: Treemap<K, V>, k: K) -> Option<V> {
match *m {
Empty => None,
Node(@ref kk, @copy v, left, right) => cond!(
| k == *kk { Some(v) }
| k < *kk { find(left, k) }
(k == *kk) { Some(v) }
(k < *kk) { find(left, k) }
_ { find(right, k) }
)
}

8
src/libsyntax/ext/expand.rs
View File

@ -559,8 +559,8 @@ pub fn core_macros() -> ~str {
//
// ~~~
// let clamped = cond!(
// | x > mx { mx }
// | x < mn { mn }
// (x > mx) { mx }
// (x < mn) { mn }
// _ { x }
// );
// ~~~
@ -568,12 +568,12 @@ pub fn core_macros() -> ~str {
// The optional default case is denoted by `_`.
//
macro_rules! cond (
($( | $pred:expr $body:block)+ _ $default:block ) => (
( $(($pred:expr) $body:block)+ _ $default:block ) => (
$(if $pred $body else)+
$default
);
// for if the default case was ommitted
( $( | $pred:expr $body:block )+ ) => (
( $(($pred:expr) $body:block)+ ) => (
$(if $pred $body)else+
);
)

6
src/test/run-pass/cond-macro-no-default.rs
View File

@ -10,8 +10,8 @@
fn clamp<T:Copy + Ord + Signed>(x: T, mn: T, mx: T) -> T {
cond!(
| x > mx { return mx; }
| x < mn { return mn; }
(x > mx) { return mx; }
(x < mn) { return mn; }
)
return x;
}
@ -20,4 +20,4 @@ fn main() {
assert_eq!(clamp(1, 2, 4), 2);
assert_eq!(clamp(8, 2, 4), 4);
assert_eq!(clamp(3, 2, 4), 3);
}
}

6
src/test/run-pass/cond-macro.rs
View File

@ -10,8 +10,8 @@
fn clamp<T:Copy + Ord + Signed>(x: T, mn: T, mx: T) -> T {
cond!(
| x > mx { mx }
| x < mn { mn }
(x > mx) { mx }
(x < mn) { mn }
_ { x }
)
}
@ -20,4 +20,4 @@ fn main() {
assert_eq!(clamp(1, 2, 4), 2);
assert_eq!(clamp(8, 2, 4), 4);
assert_eq!(clamp(3, 2, 4), 3);
}
}