Remove some semicolons after block calls

The remaining ones can be removed after the next snapshot. (Or
we can let the next pretty-print pass take care of them.)
This commit is contained in:
Marijn Haverbeke 2011-10-21 14:12:12 +02:00
parent 7114702496
commit 3b5b93221e
18 changed files with 41 additions and 41 deletions

View File

@ -38,18 +38,18 @@ fn test_cycles(r : rand::rng)
let v : [mutable @pointy] = [mutable];
allunder(max) {|i|
v += [mutable @{ mutable x : no_pointy, mutable y : no_pointy, mutable z: nop }];
};
}
allunder(max) {|i|
v[i].x = yes_pointy(v[under(r, max)]);
v[i].y = yes_pointy(v[under(r, max)]);
v[i].z = bind nopT(v[under(r, max)]);
};
}
// Drop refs one at a time
allunder(max) {|i|
v[i] = @{ mutable x : no_pointy, mutable y : no_pointy, mutable z: nop };
};
}
}
fn main()

View File

@ -264,8 +264,8 @@ fn check_variants_T<@T>(
check_whole_compiler(str3, file_label, safe_to_run);
}
}
};
};
}
}
}
}

View File

@ -60,20 +60,20 @@ fn vec_edits<@T>(v: [T], xs: [T]) -> [[T]] {
// When Lv == 2u, this is redundant with swap.
edits += [vec::reversed(v)];
}
ix(0u, 1u, Lv) {|i| edits += [vec_omit(v, i)]; };
ix(0u, 1u, Lv) {|i| edits += [vec_dup(v, i)]; };
ix(0u, 2u, Lv) {|i| edits += [vec_swadj(v, i)]; };
ix(1u, 2u, Lv) {|i| edits += [vec_prefix(v, i)]; };
ix(2u, 1u, Lv) {|i| edits += [vec_suffix(v, i)]; };
ix(0u, 1u, Lv) {|i| edits += [vec_omit(v, i)]; }
ix(0u, 1u, Lv) {|i| edits += [vec_dup(v, i)]; }
ix(0u, 2u, Lv) {|i| edits += [vec_swadj(v, i)]; }
ix(1u, 2u, Lv) {|i| edits += [vec_prefix(v, i)]; }
ix(2u, 1u, Lv) {|i| edits += [vec_suffix(v, i)]; }
ix(0u, 1u, len(xs)) {|j|
ix(0u, 1u, Lv) {|i|
edits += [vec_poke(v, i, xs[j])];
};
}
ix(0u, 0u, Lv) {|i|
edits += [vec_insert(v, i, xs[j])];
};
};
}
}
edits
}
@ -93,7 +93,7 @@ fn vec_to_str(v: [int]) -> str {
fn show_edits(a: [int], xs: [int]) {
log_err "=== Edits of " + vec_to_str(a) + " ===";
let b = vec_edits(a, xs);
ix(0u, 1u, len(b)) {|i| log_err vec_to_str(b[i]); };
ix(0u, 1u, len(b)) {|i| log_err vec_to_str(b[i]); }
}
fn demo_edits() {

View File

@ -50,7 +50,7 @@ fn make_random_fasta(id: str, desc: str, genelist: [aminoacids], n: int) {
uint::range(0u, n as uint) {|i|
str::push_byte(op, select_random(rng.next(100u32), genelist) as u8);
if str::byte_len(op) >= LINE_LENGTH() { log op; op = ""; }
};
}
if str::byte_len(op) > 0u { log op; }
}
@ -61,7 +61,7 @@ fn make_repeat_fasta(id: str, desc: str, s: str, n: int) {
uint::range(0u, n as uint) {|i|
str::push_byte(op, s[i % sl]);
if str::byte_len(op) >= LINE_LENGTH() { log op; op = ""; }
};
}
if str::byte_len(op) > 0u { log op; }
}

View File

@ -77,7 +77,7 @@ fn stress(num_tasks: int) {
let tasks = [];
range(0, num_tasks) {|i|
tasks += [task::spawn_joinable(copy i, stress_task)];
};
}
for t in tasks { task::join(t); }
}
@ -109,8 +109,8 @@ fn main(argv: [str]) {
out.write_line(#fmt["%d\t%d\t%s", n, fibn,
u64::str(elapsed)]);
};
};
}
}
}
}
}

View File

@ -13,7 +13,7 @@ fn f(&&n: uint) {
uint::range(0u, n) {|i|
let v: [u8] = [];
vec::reserve(v, 1000u);
};
}
}
fn main(args: [str]) {
@ -21,5 +21,5 @@ fn main(args: [str]) {
if vec::len(args) < 2u {
100u
} else { uint::parse_buf(str::bytes(args[1]), 10u) };
uint::range(0u, 100u) {|i| task::spawn(copy n, f); };
uint::range(0u, 100u) {|i| task::spawn(copy n, f); }
}

View File

@ -100,7 +100,7 @@ mod map_reduce {
map(input, bind emit(intermediates, ctrl, _, _));
intermediates.values {|v| send(v, release); };
intermediates.values {|v| send(v, release); }
send(ctrl, mapper_done);
}
@ -178,7 +178,7 @@ mod map_reduce {
}
}
reducers.values {|v| send(v, done); };
reducers.values {|v| send(v, done); }
for t in tasks { task::join(t); }
}

View File

@ -12,7 +12,7 @@ fn bitv_to_str(enclosing: fn_info, v: bitv::t) -> str {
// error is that the value type in the hash map is var_info, not a box
enclosing.vars.values {|val|
if bitv::get(v, val) { s += "foo"; }
};
}
ret s;
}

View File

@ -24,5 +24,5 @@ fn main() {
uint::range(0u, 10u) {|i|
arr += [@"key stuff"];
map.insert(arr, arr + [@"value stuff"]);
};
}
}

View File

@ -8,6 +8,6 @@ fn range(a: int, b: int, it: block(int)) {
fn main() {
let sum: int = 0;
range(0, 100) {|x| sum += x; };
range(0, 100) {|x| sum += x; }
log sum;
}

View File

@ -16,5 +16,5 @@ fn iloop(&&_i: ()) {
fn main() {
uint::range(0u, 100u) {|_i|
task::spawn((), iloop);
};
}
}

View File

@ -12,6 +12,6 @@ fn main() {
let x = ~{x: 1, y: 2, z: 3};
uint::range(0u, 10000u) {|_i|
assert (test(true, x) == 2);
};
}
assert (test(false, x) == 5);
}

View File

@ -12,6 +12,6 @@ fn main() {
let x = @{x: 1, y: 2, z: 3};
uint::range(0u, 10000u) {|i|
assert (test(true, x) == 2);
};
}
assert (test(false, x) == 5);
}

View File

@ -13,7 +13,7 @@ fn foo(src: uint) {
uint::range(0u, 10u) {|i|
let yyy = src_id;
assert (yyy == 0u);
};
}
}
_ { }
}

View File

@ -35,7 +35,7 @@ fn test_grow() {
uint::range(0u, 100u) {|i|
let val: record = {val1: 0u32, val2: 0u32, val3: 0u32};
comm::send(mychan, val);
};
}
}
@ -53,8 +53,8 @@ fn test_shrink2() {
uint::range(0u, 100u) {|_i|
let val: record = {val1: 0u32, val2: 0u32, val3: 0u32};
send(mychan, val);
};
uint::range(0u, 100u) {|_i| let x = recv(myport); };
}
uint::range(0u, 100u) {|_i| let x = recv(myport); }
}
@ -69,7 +69,7 @@ fn test_rotate() {
assert (x.val1 == i as u32);
assert (x.val2 == i as u32);
assert (x.val3 == i as u32);
};
}
}
@ -83,14 +83,14 @@ fn test_rotate_grow() {
let val: record =
{val1: i as u32, val2: i as u32, val3: i as u32};
send(mychan, val);
};
}
uint::range(0u, 10u) {|i|
let x = recv(myport);
assert (x.val1 == i as u32);
assert (x.val2 == i as u32);
assert (x.val3 == i as u32);
};
};
}
}
}
fn main() {

View File

@ -21,5 +21,5 @@ fn iloop(&&_i: ()) {
fn main() {
uint::range(0u, 16u) {|_i|
task::spawn((), iloop);
};
}
}

View File

@ -6,7 +6,7 @@ fn range(lo: uint, hi: uint, it: block(uint)) {
}
fn create_index<@T>(index: [{a: T, b: uint}], hash_fn: fn(T) -> uint) {
range(0u, 256u) {|_i| let bucket: [T] = []; };
range(0u, 256u) {|_i| let bucket: [T] = []; }
}
fn main() { }

View File

@ -15,13 +15,13 @@ fn main() {
uint::range(0u, n) {|i|
task::spawn((comm::chan(p), i), child);
expected += i;
};
}
let actual = 0u;
uint::range(0u, n) {|_i|
let j = comm::recv(p);
actual += *j;
};
}
assert expected == actual;
}