diff options
author | Ian Lance Taylor <iant@golang.org> | 2012-01-18 13:20:55 -0800 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2012-01-18 13:20:55 -0800 |
commit | 6b3462820f5a1c97adfa148df0e1e37c37a3716c (patch) | |
tree | 0b7349ea2c99eedd93db2ff7ebd589489da88ad0 /test/ken | |
parent | 20812c490736e18c454c807ed1c65304bd8b7e5d (diff) | |
download | go-6b3462820f5a1c97adfa148df0e1e37c37a3716c.tar.gz go-6b3462820f5a1c97adfa148df0e1e37c37a3716c.zip |
test: gofmt a few tests
I'm planning to change these tests, but the gofmt changes are
fairly extensive, so I'm separating the gofmt changes from the
substantive changes.
R=golang-dev, rsc, r
CC=golang-dev
https://golang.org/cl/5557052
Diffstat (limited to 'test/ken')
-rw-r--r-- | test/ken/label.go | 28 | ||||
-rw-r--r-- | test/ken/rob1.go | 49 | ||||
-rw-r--r-- | test/ken/rob2.go | 251 | ||||
-rw-r--r-- | test/ken/simpswitch.go | 21 |
4 files changed, 172 insertions, 177 deletions
diff --git a/test/ken/label.go b/test/ken/label.go index 770f33e39f..fa5dc0621f 100644 --- a/test/ken/label.go +++ b/test/ken/label.go @@ -4,33 +4,31 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. - package main -func -main() { - i := 0; +func main() { + i := 0 if false { - goto gogoloop; + goto gogoloop } if false { - goto gogoloop; + goto gogoloop } if false { - goto gogoloop; + goto gogoloop } - goto gogoloop; + goto gogoloop -// backward declared + // backward declared loop: - i = i+1; + i = i + 1 if i < 100 { - goto loop; + goto loop } - print(i); - print("\n"); - return; + print(i) + print("\n") + return gogoloop: - goto loop; + goto loop } diff --git a/test/ken/rob1.go b/test/ken/rob1.go index 03350662a2..8f1da4b7c6 100644 --- a/test/ken/rob1.go +++ b/test/ken/rob1.go @@ -7,61 +7,60 @@ package main type Item interface { - Print(); + Print() } type ListItem struct { - item Item; - next *ListItem; + item Item + next *ListItem } type List struct { - head *ListItem; + head *ListItem } func (list *List) Init() { - list.head = nil; + list.head = nil } func (list *List) Insert(i Item) { - item := new(ListItem); - item.item = i; - item.next = list.head; - list.head = item; + item := new(ListItem) + item.item = i + item.next = list.head + list.head = item } func (list *List) Print() { - i := list.head; + i := list.head for i != nil { - i.item.Print(); - i = i.next; + i.item.Print() + i = i.next } } // Something to put in a list type Integer struct { - val int; + val int } func (this *Integer) Init(i int) *Integer { - this.val = i; - return this; + this.val = i + return this } func (this *Integer) Print() { - print(this.val); + print(this.val) } -func -main() { - list := new(List); - list.Init(); +func main() { + list := new(List) + list.Init() for i := 0; i < 10; i = i + 1 { - integer := new(Integer); - integer.Init(i); - list.Insert(integer); + integer := new(Integer) + integer.Init(i) + list.Insert(integer) } - list.Print(); - print("\n"); + list.Print() + print("\n") } diff --git a/test/ken/rob2.go b/test/ken/rob2.go index af63e4d9f6..76a471cfb3 100644 --- a/test/ken/rob2.go +++ b/test/ken/rob2.go @@ -4,269 +4,268 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. - package main -const nilchar = 0; +const nilchar = 0 type Atom struct { - str string; - integer int; - next *Slist; /* in hash bucket */ + str string + integer int + next *Slist /* in hash bucket */ } type List struct { - car *Slist; - cdr*Slist; + car *Slist + cdr *Slist } type Slist struct { - isatom bool; - isstring bool; + isatom bool + isstring bool //union { - atom Atom; - list List; + atom Atom + list List //} u; } func (this *Slist) Car() *Slist { - return this.list.car; + return this.list.car } func (this *Slist) Cdr() *Slist { - return this.list.cdr; + return this.list.cdr } func (this *Slist) String() string { - return this.atom.str; + return this.atom.str } func (this *Slist) Integer() int { - return this.atom.integer; + return this.atom.integer } func (slist *Slist) Free() { if slist == nil { - return; + return } if slist.isatom { -// free(slist.String()); + // free(slist.String()); } else { - slist.Car().Free(); - slist.Cdr().Free(); + slist.Car().Free() + slist.Cdr().Free() } -// free(slist); + // free(slist); } //Slist* atom(byte *s, int i); -var token int; -var peekc int = -1; -var lineno int32 = 1; +var token int +var peekc int = -1 +var lineno int32 = 1 -var input string; -var inputindex int = 0; -var tokenbuf [100]byte; -var tokenlen int = 0; +var input string +var inputindex int = 0 +var tokenbuf [100]byte +var tokenlen int = 0 -const EOF int = -1; +const EOF int = -1 func main() { - var list *Slist; + var list *Slist - OpenFile(); - for ;; { - list = Parse(); + OpenFile() + for { + list = Parse() if list == nil { - break; + break } - list.Print(); - list.Free(); - break; + list.Print() + list.Free() + break } } func (slist *Slist) PrintOne(doparen bool) { if slist == nil { - return; + return } if slist.isatom { if slist.isstring { - print(slist.String()); + print(slist.String()) } else { - print(slist.Integer()); + print(slist.Integer()) } } else { if doparen { - print("(" ); + print("(") } - slist.Car().PrintOne(true); + slist.Car().PrintOne(true) if slist.Cdr() != nil { - print(" "); - slist.Cdr().PrintOne(false); + print(" ") + slist.Cdr().PrintOne(false) } if doparen { - print(")"); + print(")") } } } func (slist *Slist) Print() { - slist.PrintOne(true); - print("\n"); + slist.PrintOne(true) + print("\n") } func Get() int { - var c int; + var c int if peekc >= 0 { - c = peekc; - peekc = -1; + c = peekc + peekc = -1 } else { - c = int(input[inputindex]); - inputindex++; + c = int(input[inputindex]) + inputindex++ if c == '\n' { - lineno = lineno + 1; + lineno = lineno + 1 } if c == nilchar { - inputindex = inputindex - 1; - c = EOF; + inputindex = inputindex - 1 + c = EOF } } - return c; + return c } func WhiteSpace(c int) bool { - return c == ' ' || c == '\t' || c == '\r' || c == '\n'; + return c == ' ' || c == '\t' || c == '\r' || c == '\n' } func NextToken() { - var i, c int; + var i, c int - tokenbuf[0] = nilchar; // clear previous token - c = Get(); + tokenbuf[0] = nilchar // clear previous token + c = Get() for WhiteSpace(c) { - c = Get(); + c = Get() } switch c { case EOF: - token = EOF; + token = EOF case '(', ')': - token = c; - break; + token = c + break default: - for i = 0; i < 100 - 1; { // sizeof tokenbuf - 1 - tokenbuf[i] = byte(c); - i = i + 1; - c = Get(); + for i = 0; i < 100-1; { // sizeof tokenbuf - 1 + tokenbuf[i] = byte(c) + i = i + 1 + c = Get() if c == EOF { - break; + break } if WhiteSpace(c) || c == ')' { - peekc = c; - break; + peekc = c + break } } - if i >= 100 - 1 { // sizeof tokenbuf - 1 - panic("atom too long\n"); + if i >= 100-1 { // sizeof tokenbuf - 1 + panic("atom too long\n") } - tokenlen = i; - tokenbuf[i] = nilchar; + tokenlen = i + tokenbuf[i] = nilchar if '0' <= tokenbuf[0] && tokenbuf[0] <= '9' { - token = '0'; + token = '0' } else { - token = 'A'; + token = 'A' } } } func Expect(c int) { if token != c { - print("parse error: expected ", c, "\n"); - panic("parse"); + print("parse error: expected ", c, "\n") + panic("parse") } - NextToken(); + NextToken() } // Parse a non-parenthesized list up to a closing paren or EOF func ParseList() *Slist { - var slist, retval *Slist; - - slist = new(Slist); - slist.list.car = nil; - slist.list.cdr = nil; - slist.isatom = false; - slist.isstring = false; - - retval = slist; - for ;; { - slist.list.car = Parse(); - if token == ')' || token == EOF { // empty cdr - break; + var slist, retval *Slist + + slist = new(Slist) + slist.list.car = nil + slist.list.cdr = nil + slist.isatom = false + slist.isstring = false + + retval = slist + for { + slist.list.car = Parse() + if token == ')' || token == EOF { // empty cdr + break } - slist.list.cdr = new(Slist); - slist = slist.list.cdr; + slist.list.cdr = new(Slist) + slist = slist.list.cdr } - return retval; + return retval } -func atom(i int) *Slist { // BUG: uses tokenbuf; should take argument) - var slist *Slist; +func atom(i int) *Slist { // BUG: uses tokenbuf; should take argument) + var slist *Slist - slist = new(Slist); + slist = new(Slist) if token == '0' { - slist.atom.integer = i; - slist.isstring = false; + slist.atom.integer = i + slist.isstring = false } else { - slist.atom.str = string(tokenbuf[0:tokenlen]); - slist.isstring = true; + slist.atom.str = string(tokenbuf[0:tokenlen]) + slist.isstring = true } - slist.isatom = true; - return slist; + slist.isatom = true + return slist } -func atoi() int { // BUG: uses tokenbuf; should take argument) - var v int = 0; +func atoi() int { // BUG: uses tokenbuf; should take argument) + var v int = 0 for i := 0; i < tokenlen && '0' <= tokenbuf[i] && tokenbuf[i] <= '9'; i = i + 1 { - v = 10 * v + int(tokenbuf[i] - '0'); + v = 10*v + int(tokenbuf[i]-'0') } - return v; + return v } func Parse() *Slist { - var slist *Slist; + var slist *Slist if token == EOF || token == ')' { - return nil; + return nil } if token == '(' { - NextToken(); - slist = ParseList(); - Expect(')'); - return slist; + NextToken() + slist = ParseList() + Expect(')') + return slist } else { // Atom switch token { case EOF: - return nil; + return nil case '0': - slist = atom(atoi()); + slist = atom(atoi()) case '"', 'A': - slist = atom(0); + slist = atom(0) default: - slist = nil; - print("unknown token: ", token, "\n"); + slist = nil + print("unknown token: ", token, "\n") } - NextToken(); - return slist; + NextToken() + return slist } - return nil; + return nil } func OpenFile() { - input = "(defn foo (add 12 34))\n\x00"; - inputindex = 0; - peekc = -1; // BUG - NextToken(); + input = "(defn foo (add 12 34))\n\x00" + inputindex = 0 + peekc = -1 // BUG + NextToken() } diff --git a/test/ken/simpswitch.go b/test/ken/simpswitch.go index ab5dd356b3..4db98b1c09 100644 --- a/test/ken/simpswitch.go +++ b/test/ken/simpswitch.go @@ -6,19 +6,18 @@ package main -func -main() { - a := 3; - for i:=0; i<10; i=i+1 { - switch(i) { +func main() { + a := 3 + for i := 0; i < 10; i = i + 1 { + switch i { case 5: - print("five"); - case a,7: - print("a"); + print("five") + case a, 7: + print("a") default: - print(i); + print(i) } - print("out", i); + print("out", i) } - print("\n"); + print("\n") } |