diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-01-18 22:37:22 -0800 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-01-18 23:17:34 -0800 |
| commit | 04a2887f8791bb080b4e76a55949a7c1954dbb97 (patch) | |
| tree | f072b2cc1e0b41270041a3a10a4fc313d3fa1a89 /src/test/bench | |
| parent | ca7cfbe3d0251766217e5d4e559903e655e7549b (diff) | |
| download | rust-04a2887f8791bb080b4e76a55949a7c1954dbb97.tar.gz rust-04a2887f8791bb080b4e76a55949a7c1954dbb97.zip | |
Remove '.' after nullary tags in patterns
Does what it says on the tin. The next commit will remove support for this syntax.
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/99bob-pattern.rs | 10 | ||||
| -rw-r--r-- | src/test/bench/shootout-binarytrees.rs | 2 | ||||
| -rw-r--r-- | src/test/bench/task-perf-word-count-generic.rs | 12 | ||||
| -rw-r--r-- | src/test/bench/task-perf-word-count.rs | 12 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/test/bench/99bob-pattern.rs b/src/test/bench/99bob-pattern.rs index 8bc16ec5d3a..9c068c6c747 100644 --- a/src/test/bench/99bob-pattern.rs +++ b/src/test/bench/99bob-pattern.rs @@ -12,13 +12,13 @@ tag bottle { none; dual; single; multiple(int); } fn show(b: bottle) { alt b { - none. { + none { #debug("No more bottles of beer on the wall, \ no more bottles of beer,"); #debug("Go to the store and buy some more, \ 99 bottles of beer on the wall."); } - single. { + single { #debug("1 bottle of beer on the wall, 1 bottle of beer,"); #debug("Take one down and pass it around, \ no more bottles of beer on the wall."); @@ -38,8 +38,8 @@ fn show(b: bottle) { fn next(b: bottle) -> bottle { alt b { - none. { ret none; } - single. { ret none; } + none { ret none; } + single { ret none; } dual. { ret single; } multiple(3) { ret dual; } multiple(n) { ret multiple(n - 1); } @@ -48,7 +48,7 @@ fn next(b: bottle) -> bottle { // Won't need this when tags can be compared with == -fn more(b: bottle) -> bool { alt b { none. { ret false; } _ { ret true; } } } +fn more(b: bottle) -> bool { alt b { none { ret false; } _ { ret true; } } } fn main() { let b: bottle = multiple(99); diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index d3342ea68c4..4e72ef84907 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -5,7 +5,7 @@ tag tree { nil; node(~tree, ~tree, int); } fn item_check(t: ~tree) -> int { alt *t { - nil. { ret 0; } + nil { ret 0; } node(left, right, item) { ret item + item_check(left) - item_check(right); } diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 1c5b7dc2516..6a23664f753 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -37,7 +37,7 @@ fn map(&&filename: [u8], emit: map_reduce::putter<[u8], int>) { while true { alt read_word(f) { some(w) { emit(str::bytes(w), 1); } - none. { break; } + none { break; } } } } @@ -45,7 +45,7 @@ fn map(&&filename: [u8], emit: map_reduce::putter<[u8], int>) { fn reduce(&&_word: [u8], get: map_reduce::getter<int>) { let count = 0; - while true { alt get() { some(_) { count += 1; } none. { break; } } } + while true { alt get() { some(_) { count += 1; } none { break; } } } } mod map_reduce { @@ -97,7 +97,7 @@ mod map_reduce { let c; alt treemap::find(im, key) { some(_c) { c = _c; } - none. { + none { let p = port(); send(ctrl, find_reducer(key, chan(p))); c = recv(p); @@ -136,7 +136,7 @@ mod map_reduce { // #error("received %d", v); ret some(v); } - done. { + done { // #error("all done"); is_done = true; } @@ -166,7 +166,7 @@ mod map_reduce { while num_mappers > 0 { alt recv(ctrl) { - mapper_done. { + mapper_done { // #error("received mapper terminated."); num_mappers -= 1; } @@ -179,7 +179,7 @@ mod map_reduce { // "reusing existing reducer for " + k); c = _c; } - none. { + none { // log(error, "creating new reducer for " + k); let p = port(); let ch = chan(p); diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs index eb421ae9b08..02adfd610b0 100644 --- a/src/test/bench/task-perf-word-count.rs +++ b/src/test/bench/task-perf-word-count.rs @@ -26,14 +26,14 @@ fn map(input: str, emit: map_reduce::putter) { while true { - alt read_word(f) { some(w) { emit(w, 1); } none. { break; } } + alt read_word(f) { some(w) { emit(w, 1); } none { break; } } } } fn reduce(_word: str, get: map_reduce::getter) { let count = 0; - while true { alt get() { some(_) { count += 1; } none. { break; } } } + while true { alt get() { some(_) { count += 1; } none { break; } } } } mod map_reduce { @@ -78,7 +78,7 @@ mod map_reduce { some(_c) { c = _c; } - none. { + none { let p = port(); send(ctrl, find_reducer(key, chan(p))); c = recv(p); @@ -112,7 +112,7 @@ mod map_reduce { // #error("received %d", v); ret some(v); } - done. { + done { // #error("all done"); state.is_done = true; } @@ -141,7 +141,7 @@ mod map_reduce { while num_mappers > 0 { alt recv(ctrl) { - mapper_done. { + mapper_done { // #error("received mapper terminated."); num_mappers -= 1; } @@ -154,7 +154,7 @@ mod map_reduce { // "reusing existing reducer for " + k); c = _c; } - none. { + none { // log(error, "creating new reducer for " + k); let p = port(); let ch = chan(p); |
