diff options
| author | Robert Griesemer <gri@golang.org> | 2009-11-05 18:26:16 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2009-11-05 18:26:16 -0800 |
| commit | ec7edf40f227e56a1213d9b42a041edd92a44989 (patch) | |
| tree | 45db4b1214307a1ed85262da0861600d4a80cdf3 /src/pkg/testing | |
| parent | 4e0e4e6c258d68c63380b6215ccca38bbba6a204 (diff) | |
| download | golang-ec7edf40f227e56a1213d9b42a041edd92a44989.tar.gz | |
gofmt'ed more stragglers
R=rsc
http://go/go-review/1019004
Diffstat (limited to 'src/pkg/testing')
| -rw-r--r-- | src/pkg/testing/regexp.go | 18 | ||||
| -rw-r--r-- | src/pkg/testing/script/script.go | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/pkg/testing/regexp.go b/src/pkg/testing/regexp.go index 25eccdb07..a91ae4dbb 100644 --- a/src/pkg/testing/regexp.go +++ b/src/pkg/testing/regexp.go @@ -76,7 +76,7 @@ func (c *common) setIndex(i int) { // The representation of a compiled regular expression. // The public interface is entirely through methods. type Regexp struct { - expr string; // the original expression + expr string; // the original expression inst []instr; start instr; nbra int; // number of brackets in expression, for subexpressions @@ -440,7 +440,7 @@ func (p *parser) term() (start, end instr) { // The other functions (closure(), concatenation() etc.) assume // it's safe to recur to here. if p.error != "" { - return + return; } switch c := p.c(); c { case '|', endOfFile: @@ -473,7 +473,7 @@ func (p *parser) term() (start, end instr) { p.nextc(); start = p.charClass(); if p.error != "" { - return + return; } if p.c() != ']' { p.error = ErrUnmatchedLbkt; @@ -580,7 +580,7 @@ func (p *parser) concatenation() (start, end instr) { for { nstart, nend := p.closure(); if p.error != "" { - return + return; } switch { case nstart == nil: // end of this concatenation @@ -602,7 +602,7 @@ func (p *parser) concatenation() (start, end instr) { func (p *parser) regexp() (start, end instr) { start, end = p.concatenation(); if p.error != "" { - return + return; } for { switch p.c() { @@ -612,7 +612,7 @@ func (p *parser) regexp() (start, end instr) { p.nextc(); nstart, nend := p.concatenation(); if p.error != "" { - return + return; } alt := new(_Alt); p.re.add(alt); @@ -700,7 +700,7 @@ func addState(s []state, inst instr, match []int) []state { // go in order correctly and this "earlier" test is never necessary, for i := 0; i < l; i++ { if s[i].inst.index() == index && // same instruction - s[i].match[0] < pos { // earlier match already going; lefmost wins + s[i].match[0] < pos { // earlier match already going; lefmost wins return s; } } @@ -801,8 +801,8 @@ func (re *Regexp) doExecute(str string, bytes []byte, pos int) []int { case _END: // choose leftmost longest if !found || // first - st.match[0] < final.match[0] || // leftmost - (st.match[0] == final.match[0] && pos > final.match[1]) { // longest + st.match[0] < final.match[0] || // leftmost + (st.match[0] == final.match[0] && pos > final.match[1]) { // longest final = st; final.match[1] = pos; } diff --git a/src/pkg/testing/script/script.go b/src/pkg/testing/script/script.go index 71e7cdca4..65ccb09dd 100644 --- a/src/pkg/testing/script/script.go +++ b/src/pkg/testing/script/script.go @@ -195,8 +195,8 @@ func (s Close) send() { // A ReceivedUnexpected error results if no active Events match a value // received from a channel. type ReceivedUnexpected struct { - Value interface{}; - ready []*Event; + Value interface{}; + ready []*Event; } func (r ReceivedUnexpected) String() string { |