Skip to content

Commit e200a20

Browse files
committed
---
yaml --- r: 7278 b: refs/heads/master c: 93dcb9f h: refs/heads/master v: v3
1 parent e6ab172 commit e200a20

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 9c21673e3fc960714e143a55f8f0b05522ca850c
2+
refs/heads/master: 93dcb9fb6b696e65e24c9a9a37658bf43f42adc3

trunk/src/test/bench/shootout-fannkuchredux.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import vec;
55

66
fn fannkuch(n: int) -> int {
77
fn perm1init(i: uint) -> int { ret i as int; }
8-
let perm1init_ = perm1init; // Rustboot workaround
98

109
let perm = vec::init_elt_mut(0, n as uint);
11-
let perm1 = vec::init_fn_mut(perm1init_, n as uint);
10+
let perm1 = vec::init_fn_mut(perm1init, n as uint);
1211
let count = vec::init_elt_mut(0, n as uint);
1312
let f = 0;
1413
let i = 0;
@@ -43,7 +42,10 @@ fn fannkuch(n: int) -> int {
4342

4443
let go = true;
4544
while go {
46-
if r == n { log(debug, checksum); ret flips; }
45+
if r == n {
46+
std::io::println(#fmt("%d", checksum));
47+
ret flips;
48+
}
4749
let p0 = perm1[0];
4850
i = 0;
4951
while i < r { let j = i + 1; perm1[i] = perm1[j]; i = j; }
@@ -57,6 +59,10 @@ fn fannkuch(n: int) -> int {
5759
}
5860

5961
fn main(args: [str]) {
60-
let n = 7;
61-
#debug("Pfannkuchen(%d) = %d", n, fannkuch(n));
62+
let n = if vec::len(args) == 2u {
63+
int::from_str(args[1])
64+
} else {
65+
10
66+
};
67+
std::io::println(#fmt("Pfannkuchen(%d) = %d", n, fannkuch(n)));
6268
}

0 commit comments

Comments
 (0)