From 881d6064d23d9da5c7ff368bc7d41d271290deff Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 15 Dec 2009 15:27:16 -0800 Subject: 1) Change default gofmt default settings for parsing and printing to new syntax. Use -oldparser to parse the old syntax, use -oldprinter to print the old syntax. 2) Change default gofmt formatting settings to use tabs for indentation only and to use spaces for alignment. This will make the code alignment insensitive to an editor's tabwidth. Use -spaces=false to use tabs for alignment. 3) Manually changed src/exp/parser/parser_test.go so that it doesn't try to parse the parser's source files using the old syntax (they have new syntax now). 4) gofmt -w src misc test/bench 2nd set of files. R=rsc CC=golang-dev http://codereview.appspot.com/179067 --- src/pkg/encoding/ascii85/ascii85_test.go | 140 +++++++++++++++---------------- 1 file changed, 70 insertions(+), 70 deletions(-) (limited to 'src/pkg/encoding/ascii85/ascii85_test.go') diff --git a/src/pkg/encoding/ascii85/ascii85_test.go b/src/pkg/encoding/ascii85/ascii85_test.go index 5ac49c675..7eb245ee2 100644 --- a/src/pkg/encoding/ascii85/ascii85_test.go +++ b/src/pkg/encoding/ascii85/ascii85_test.go @@ -5,16 +5,16 @@ package ascii85 import ( - "bytes"; - "io/ioutil"; - "os"; - "reflect"; - "strings"; - "testing"; + "bytes" + "io/ioutil" + "os" + "reflect" + "strings" + "testing" ) type testpair struct { - decoded, encoded string; + decoded, encoded string } var pairs = []testpair{ @@ -35,88 +35,88 @@ var pairs = []testpair{ var bigtest = pairs[len(pairs)-1] func testEqual(t *testing.T, msg string, args ...) bool { - v := reflect.NewValue(args).(*reflect.StructValue); - v1 := v.Field(v.NumField() - 2); - v2 := v.Field(v.NumField() - 1); + v := reflect.NewValue(args).(*reflect.StructValue) + v1 := v.Field(v.NumField() - 2) + v2 := v.Field(v.NumField() - 1) if v1.Interface() != v2.Interface() { - t.Errorf(msg, args); - return false; + t.Errorf(msg, args) + return false } - return true; + return true } func strip85(s string) string { - t := make([]byte, len(s)); - w := 0; + t := make([]byte, len(s)) + w := 0 for r := 0; r < len(s); r++ { - c := s[r]; + c := s[r] if c > ' ' { - t[w] = c; - w++; + t[w] = c + w++ } } - return string(t[0:w]); + return string(t[0:w]) } func TestEncode(t *testing.T) { for _, p := range pairs { - buf := make([]byte, MaxEncodedLen(len(p.decoded))); - n := Encode(buf, strings.Bytes(p.decoded)); - buf = buf[0:n]; - testEqual(t, "Encode(%q) = %q, want %q", p.decoded, strip85(string(buf)), strip85(p.encoded)); + buf := make([]byte, MaxEncodedLen(len(p.decoded))) + n := Encode(buf, strings.Bytes(p.decoded)) + buf = buf[0:n] + testEqual(t, "Encode(%q) = %q, want %q", p.decoded, strip85(string(buf)), strip85(p.encoded)) } } func TestEncoder(t *testing.T) { for _, p := range pairs { - bb := &bytes.Buffer{}; - encoder := NewEncoder(bb); - encoder.Write(strings.Bytes(p.decoded)); - encoder.Close(); - testEqual(t, "Encode(%q) = %q, want %q", p.decoded, strip85(bb.String()), strip85(p.encoded)); + bb := &bytes.Buffer{} + encoder := NewEncoder(bb) + encoder.Write(strings.Bytes(p.decoded)) + encoder.Close() + testEqual(t, "Encode(%q) = %q, want %q", p.decoded, strip85(bb.String()), strip85(p.encoded)) } } func TestEncoderBuffering(t *testing.T) { - input := strings.Bytes(bigtest.decoded); + input := strings.Bytes(bigtest.decoded) for bs := 1; bs <= 12; bs++ { - bb := &bytes.Buffer{}; - encoder := NewEncoder(bb); + bb := &bytes.Buffer{} + encoder := NewEncoder(bb) for pos := 0; pos < len(input); pos += bs { - end := pos + bs; + end := pos + bs if end > len(input) { end = len(input) } - n, err := encoder.Write(input[pos:end]); - testEqual(t, "Write(%q) gave error %v, want %v", input[pos:end], err, os.Error(nil)); - testEqual(t, "Write(%q) gave length %v, want %v", input[pos:end], n, end-pos); + n, err := encoder.Write(input[pos:end]) + testEqual(t, "Write(%q) gave error %v, want %v", input[pos:end], err, os.Error(nil)) + testEqual(t, "Write(%q) gave length %v, want %v", input[pos:end], n, end-pos) } - err := encoder.Close(); - testEqual(t, "Close gave error %v, want %v", err, os.Error(nil)); - testEqual(t, "Encoding/%d of %q = %q, want %q", bs, bigtest.decoded, strip85(bb.String()), strip85(bigtest.encoded)); + err := encoder.Close() + testEqual(t, "Close gave error %v, want %v", err, os.Error(nil)) + testEqual(t, "Encoding/%d of %q = %q, want %q", bs, bigtest.decoded, strip85(bb.String()), strip85(bigtest.encoded)) } } func TestDecode(t *testing.T) { for _, p := range pairs { - dbuf := make([]byte, 4*len(p.encoded)); - ndst, nsrc, err := Decode(dbuf, strings.Bytes(p.encoded), true); - testEqual(t, "Decode(%q) = error %v, want %v", p.encoded, err, os.Error(nil)); - testEqual(t, "Decode(%q) = nsrc %v, want %v", p.encoded, nsrc, len(p.encoded)); - testEqual(t, "Decode(%q) = ndst %v, want %v", p.encoded, ndst, len(p.decoded)); - testEqual(t, "Decode(%q) = %q, want %q", p.encoded, string(dbuf[0:ndst]), p.decoded); + dbuf := make([]byte, 4*len(p.encoded)) + ndst, nsrc, err := Decode(dbuf, strings.Bytes(p.encoded), true) + testEqual(t, "Decode(%q) = error %v, want %v", p.encoded, err, os.Error(nil)) + testEqual(t, "Decode(%q) = nsrc %v, want %v", p.encoded, nsrc, len(p.encoded)) + testEqual(t, "Decode(%q) = ndst %v, want %v", p.encoded, ndst, len(p.decoded)) + testEqual(t, "Decode(%q) = %q, want %q", p.encoded, string(dbuf[0:ndst]), p.decoded) } } func TestDecoder(t *testing.T) { for _, p := range pairs { - decoder := NewDecoder(bytes.NewBufferString(p.encoded)); - dbuf, err := ioutil.ReadAll(decoder); + decoder := NewDecoder(bytes.NewBufferString(p.encoded)) + dbuf, err := ioutil.ReadAll(decoder) if err != nil { t.Fatal("Read failed", err) } - testEqual(t, "Read from %q = length %v, want %v", p.encoded, len(dbuf), len(p.decoded)); - testEqual(t, "Decoding of %q = %q, want %q", p.encoded, string(dbuf), p.decoded); + testEqual(t, "Read from %q = length %v, want %v", p.encoded, len(dbuf), len(p.decoded)) + testEqual(t, "Decoding of %q = %q, want %q", p.encoded, string(dbuf), p.decoded) if err != nil { testEqual(t, "Read from %q = %v, want %v", p.encoded, err, os.EOF) } @@ -125,31 +125,31 @@ func TestDecoder(t *testing.T) { func TestDecoderBuffering(t *testing.T) { for bs := 1; bs <= 12; bs++ { - decoder := NewDecoder(bytes.NewBufferString(bigtest.encoded)); - buf := make([]byte, len(bigtest.decoded)+12); - var total int; + decoder := NewDecoder(bytes.NewBufferString(bigtest.encoded)) + buf := make([]byte, len(bigtest.decoded)+12) + var total int for total = 0; total < len(bigtest.decoded); { - n, err := decoder.Read(buf[total : total+bs]); - testEqual(t, "Read from %q at pos %d = %d, %v, want _, %v", bigtest.encoded, total, n, err, os.Error(nil)); - total += n; + n, err := decoder.Read(buf[total : total+bs]) + testEqual(t, "Read from %q at pos %d = %d, %v, want _, %v", bigtest.encoded, total, n, err, os.Error(nil)) + total += n } - testEqual(t, "Decoding/%d of %q = %q, want %q", bs, bigtest.encoded, string(buf[0:total]), bigtest.decoded); + testEqual(t, "Decoding/%d of %q = %q, want %q", bs, bigtest.encoded, string(buf[0:total]), bigtest.decoded) } } func TestDecodeCorrupt(t *testing.T) { type corrupt struct { - e string; - p int; + e string + p int } examples := []corrupt{ corrupt{"v", 0}, corrupt{"!z!!!!!!!!!", 1}, - }; + } for _, e := range examples { - dbuf := make([]byte, 4*len(e.e)); - _, _, err := Decode(dbuf, strings.Bytes(e.e), true); + dbuf := make([]byte, 4*len(e.e)) + _, _, err := Decode(dbuf, strings.Bytes(e.e), true) switch err := err.(type) { case CorruptInputError: testEqual(t, "Corruption in %q at offset %v, want %v", e.e, int(err), e.p) @@ -160,34 +160,34 @@ func TestDecodeCorrupt(t *testing.T) { } func TestBig(t *testing.T) { - n := 3*1000 + 1; - raw := make([]byte, n); - const alpha = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + n := 3*1000 + 1 + raw := make([]byte, n) + const alpha = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" for i := 0; i < n; i++ { raw[i] = alpha[i%len(alpha)] } - encoded := new(bytes.Buffer); - w := NewEncoder(encoded); - nn, err := w.Write(raw); + encoded := new(bytes.Buffer) + w := NewEncoder(encoded) + nn, err := w.Write(raw) if nn != n || err != nil { t.Fatalf("Encoder.Write(raw) = %d, %v want %d, nil", nn, err, n) } - err = w.Close(); + err = w.Close() if err != nil { t.Fatalf("Encoder.Close() = %v want nil", err) } - decoded, err := ioutil.ReadAll(NewDecoder(encoded)); + decoded, err := ioutil.ReadAll(NewDecoder(encoded)) if err != nil { t.Fatalf("io.ReadAll(NewDecoder(...)): %v", err) } if !bytes.Equal(raw, decoded) { - var i int; + var i int for i = 0; i < len(decoded) && i < len(raw); i++ { if decoded[i] != raw[i] { break } } - t.Errorf("Decode(Encode(%d-byte string)) failed at offset %d", n, i); + t.Errorf("Decode(Encode(%d-byte string)) failed at offset %d", n, i) } } -- cgit v1.2.3