1 files changed, 54 insertions, 48 deletions

diff --git a/test/ken/string.go b/test/ken/string.go
index 14617de9c..6c15b1616 100644
--- a/test/ken/string.go
+++ b/test/ken/string.go
@@ -7,106 +7,112 @@
 
 package main
 
-func
-main() {
-	var c string;
+func main() {
+	var c string
 
-	a := `abc`;
-	b := `xyz`;
+	a := `abc`
+	b := `xyz`
 
 	/* print a literal */
-	print(`abc`);
+	print(`abc`)
 
 	/* print a variable */
-	print(b, "-");
+	print(b, "-")
 
 	/* catenate literals */
-	print(`abc` + `xyz`, "-");
+	print(`abc`+`xyz`, "-")
 
 	/* catenate variables */
-	print(a+b, "-");
+	print(a+b, "-")
 
 	/* compare literals */
 	if `abc` == `xyz` || `abc` != "abc" || `abc` > `xyz` {
-		panic("compare literals");
+		panic("compare literals")
 	}
 
 	/* compare variables */
 	if a == b || a != a || a > b {
-		panic("compare variables");
+		panic("compare variables")
 	}
 
 	/* cat */
-	c = a+b;
-	print(c, "-");
+	c = a + b
+	print(c, "-")
 
 	/* catequal */
-	c = a;
-	c += b;
-	print(c, "-");
+	c = a
+	c += b
+	print(c, "-")
 
 	/* clumsy evaluation */
-	c = b;
-	c = a + c;
-	print(c, "-");
+	c = b
+	c = a + c
+	print(c, "-")
 
 	/* len */
 	if len(c) != 6 {
-		panic("len ", len(c));
+		print("len ", len(c))
+		panic("fail")
 	}
 
 	/* index strings */
-	for i:=0; i<len(c); i=i+1 {
-		if c[i] != (a+b)[i] {
-			panic("index ", i, " ", c[i], " ", (a+b)[i]);
+	for i := 0; i < len(c); i = i + 1 {
+		if c[i] != (a + b)[i] {
+			print("index ", i, " ", c[i], " ", (a + b)[i])
+			panic("fail")
 		}
 	}
 
 	/* slice strings */
-	print(c[0:3], c[3:]);
+	print(c[0:3], c[3:])
 
-	print("\n");
+	print("\n")
 
 	/* create string with integer constant */
-	c = string('x');
+	c = string('x')
 	if c != "x" {
-		panic("create int ", c);
+		print("create int ", c)
+		panic("fail")
 	}
 
 	/* create string with integer variable */
-	v := 'x';
-	c = string(v);
+	v := 'x'
+	c = string(v)
 	if c != "x" {
-		panic("create int ", c);
+		print("create int ", c)
+		panic("fail")
 	}
 
 	/* create string with byte array */
-	var z1 [3]byte;
-	z1[0] = 'a';
-	z1[1] = 'b';
-	z1[2] = 'c';
-	c = string(&z1);
+	var z1 [3]byte
+	z1[0] = 'a'
+	z1[1] = 'b'
+	z1[2] = 'c'
+	c = string(&z1)
 	if c != "abc" {
-		panic("create byte array ", c);
+		print("create byte array ", c)
+		panic("fail")
 	}
 
 	/* create string with int array */
-	var z2 [3]int;
-	z2[0] = 'a';
-	z2[1] = '\u1234';
-	z2[2] = 'c';
-	c = string(&z2);
+	var z2 [3]int
+	z2[0] = 'a'
+	z2[1] = '\u1234'
+	z2[2] = 'c'
+	c = string(&z2)
 	if c != "a\u1234c" {
-		panic("create int array ", c);
+		print("create int array ", c)
+		panic("fail")
 	}
 
 	/* create string with byte array pointer */
-	z3 := new([3]byte);
-	z3[0] = 'a';
-	z3[1] = 'b';
-	z3[2] = 'c';
-	c = string(z3);
+	z3 := new([3]byte)
+	z3[0] = 'a'
+	z3[1] = 'b'
+	z3[2] = 'c'
+	c = string(z3)
 	if c != "abc" {
-		panic("create array pointer ", c);
+		print("create array pointer ", c)
+		panic("fail")
 	}
 }