single argument panic

note that sortmain.go has been run through hg gofmt;
only the formatting of the day initializers changed.
i'm happy to revert that formatting if you'd prefer.

stop on error in doc/progs/run

R=r
CC=golang-dev
http://codereview.appspot.com/850041

1 files changed, 41 insertions, 41 deletions

diff --git a/test/peano.go b/test/peano.go
index ccff66bfe..77a0d1272 100644
--- a/test/peano.go
+++ b/test/peano.go
@@ -15,51 +15,51 @@ type Number struct {
 // Peano primitives
 
 func zero() *Number {
-	return nil;
+	return nil
 }
 
 
 func is_zero(x *Number) bool {
-	return x == nil;
+	return x == nil
 }
 
 
 func add1(x *Number) *Number {
-	e := new(Number);
-	e.next = x;
-	return e;
+	e := new(Number)
+	e.next = x
+	return e
 }
 
 
 func sub1(x *Number) *Number {
-	return x.next;
+	return x.next
 }
 
 
-func add(x, y *Number) *Number{
+func add(x, y *Number) *Number {
 	if is_zero(y) {
-		return x;
+		return x
 	}
 
-	return add(add1(x), sub1(y));
+	return add(add1(x), sub1(y))
 }
 
 
 func mul(x, y *Number) *Number {
-	if is_zero(x) || is_zero(y){
-		return zero();
+	if is_zero(x) || is_zero(y) {
+		return zero()
 	}
 
-	return add(mul(x, sub1(y)), x);
+	return add(mul(x, sub1(y)), x)
 }
 
 
 func fact(n *Number) *Number {
 	if is_zero(n) {
-		return add1(zero());
+		return add1(zero())
 	}
 
-	return mul(fact(sub1(n)), n);
+	return mul(fact(sub1(n)), n)
 }
 
 
@@ -68,26 +68,27 @@ func fact(n *Number) *Number {
 
 func gen(n int) *Number {
 	if n > 0 {
-		return add1(gen(n - 1));
+		return add1(gen(n - 1))
 	}
 
-	return zero();
+	return zero()
 }
 
 
 func count(x *Number) int {
 	if is_zero(x) {
-		return 0;
+		return 0
 	}
 
-	return count(sub1(x)) + 1;
+	return count(sub1(x)) + 1
 }
 
 
 func check(x *Number, expected int) {
-	var c = count(x);
+	var c = count(x)
 	if c != expected {
-		panic("error: found ", c, "; expected ", expected, "\n");
+		print("error: found ", c, "; expected ", expected, "\n")
+		panic("fail")
 	}
 }
 
@@ -96,24 +97,24 @@ func check(x *Number, expected int) {
 // Test basic functionality
 
 func verify() {
-	check(zero(), 0);
-	check(add1(zero()), 1);
-	check(gen(10), 10);
-
-	check(add(gen(3), zero()), 3);
-	check(add(zero(), gen(4)), 4);
-	check(add(gen(3), gen(4)), 7);
-
-	check(mul(zero(), zero()), 0);
-	check(mul(gen(3), zero()), 0);
-	check(mul(zero(), gen(4)), 0);
-	check(mul(gen(3), add1(zero())), 3);
-	check(mul(add1(zero()), gen(4)), 4);
-	check(mul(gen(3), gen(4)), 12);
-
-	check(fact(zero()), 1);
-	check(fact(add1(zero())), 1);
-	check(fact(gen(5)), 120);
+	check(zero(), 0)
+	check(add1(zero()), 1)
+	check(gen(10), 10)
+
+	check(add(gen(3), zero()), 3)
+	check(add(zero(), gen(4)), 4)
+	check(add(gen(3), gen(4)), 7)
+
+	check(mul(zero(), zero()), 0)
+	check(mul(gen(3), zero()), 0)
+	check(mul(zero(), gen(4)), 0)
+	check(mul(gen(3), add1(zero())), 3)
+	check(mul(add1(zero()), gen(4)), 4)
+	check(mul(gen(3), gen(4)), 12)
+
+	check(fact(zero()), 1)
+	check(fact(add1(zero())), 1)
+	check(fact(gen(5)), 120)
 }
 
 
@@ -123,9 +124,8 @@ func verify() {
 
 func main() {
 
-	verify();
+	verify()
 	for i := 0; i <= 9; i++ {
-		print(i, "! = ", count(fact(gen(i))), "\n");
+		print(i, "! = ", count(fact(gen(i))), "\n")
 	}
 }
-