mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
more casifying fixups
R=rsc DELTA=213 (0 added, 0 deleted, 213 changed) OCL=22878 CL=22882
This commit is contained in:
Rob Pike
parent
497bb9c07d
commit
1d74892178
2 changed files with 193 additions and 193 deletions
|
|
@ -20,134 +20,134 @@ export func TestFmtInterface(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
type FmtTest struct {
|
||||
type fmtTest struct {
|
||||
fmt string;
|
||||
val interface { };
|
||||
out string;
|
||||
}
|
||||
|
||||
const B32 uint32 = 1<<32 - 1
|
||||
const B64 uint64 = 1<<64 - 1
|
||||
const b32 uint32 = 1<<32 - 1
|
||||
const b64 uint64 = 1<<64 - 1
|
||||
var array = []int{1, 2, 3, 4, 5}
|
||||
|
||||
|
||||
var fmttests = []FmtTest{
|
||||
var fmttests = []fmtTest{
|
||||
// basic string
|
||||
FmtTest{ "%s", "abc", "abc" },
|
||||
FmtTest{ "%x", "abc", "616263" },
|
||||
FmtTest{ "%x", "xyz", "78797a" },
|
||||
FmtTest{ "%X", "xyz", "78797A" },
|
||||
FmtTest{ "%q", "abc", `"abc"` },
|
||||
fmtTest{ "%s", "abc", "abc" },
|
||||
fmtTest{ "%x", "abc", "616263" },
|
||||
fmtTest{ "%x", "xyz", "78797a" },
|
||||
fmtTest{ "%X", "xyz", "78797A" },
|
||||
fmtTest{ "%q", "abc", `"abc"` },
|
||||
|
||||
// basic bytes
|
||||
FmtTest{ "%s", io.StringBytes("abc"), "abc" },
|
||||
FmtTest{ "%x", io.StringBytes("abc"), "616263" },
|
||||
FmtTest{ "% x", io.StringBytes("abc"), "61 62 63" },
|
||||
FmtTest{ "%x", io.StringBytes("xyz"), "78797a" },
|
||||
FmtTest{ "%X", io.StringBytes("xyz"), "78797A" },
|
||||
FmtTest{ "%q", io.StringBytes("abc"), `"abc"` },
|
||||
fmtTest{ "%s", io.StringBytes("abc"), "abc" },
|
||||
fmtTest{ "%x", io.StringBytes("abc"), "616263" },
|
||||
fmtTest{ "% x", io.StringBytes("abc"), "61 62 63" },
|
||||
fmtTest{ "%x", io.StringBytes("xyz"), "78797a" },
|
||||
fmtTest{ "%X", io.StringBytes("xyz"), "78797A" },
|
||||
fmtTest{ "%q", io.StringBytes("abc"), `"abc"` },
|
||||
|
||||
// escaped strings
|
||||
FmtTest{ "%#q", `abc`, "`abc`" },
|
||||
FmtTest{ "%#q", `"`, "`\"`" },
|
||||
FmtTest{ "1 %#q", `\n`, "1 `\\n`" },
|
||||
FmtTest{ "2 %#q", "\n", `2 "\n"` },
|
||||
FmtTest{ "%q", `"`, `"\""` },
|
||||
FmtTest{ "%q", "\a\b\f\r\n\t\v", `"\a\b\f\r\n\t\v"` },
|
||||
FmtTest{ "%q", "abc\xffdef", `"abc\xffdef"` },
|
||||
FmtTest{ "%q", "\u263a", `"\u263a"` },
|
||||
FmtTest{ "%q", "\U0010ffff", `"\U0010ffff"` },
|
||||
fmtTest{ "%#q", `abc`, "`abc`" },
|
||||
fmtTest{ "%#q", `"`, "`\"`" },
|
||||
fmtTest{ "1 %#q", `\n`, "1 `\\n`" },
|
||||
fmtTest{ "2 %#q", "\n", `2 "\n"` },
|
||||
fmtTest{ "%q", `"`, `"\""` },
|
||||
fmtTest{ "%q", "\a\b\f\r\n\t\v", `"\a\b\f\r\n\t\v"` },
|
||||
fmtTest{ "%q", "abc\xffdef", `"abc\xffdef"` },
|
||||
fmtTest{ "%q", "\u263a", `"\u263a"` },
|
||||
fmtTest{ "%q", "\U0010ffff", `"\U0010ffff"` },
|
||||
|
||||
// width
|
||||
FmtTest{ "%5s", "abc", " abc" },
|
||||
FmtTest{ "%-5s", "abc", "abc " },
|
||||
FmtTest{ "%05s", "abc", "00abc" },
|
||||
fmtTest{ "%5s", "abc", " abc" },
|
||||
fmtTest{ "%-5s", "abc", "abc " },
|
||||
fmtTest{ "%05s", "abc", "00abc" },
|
||||
|
||||
// integers
|
||||
FmtTest{ "%d", 12345, "12345" },
|
||||
FmtTest{ "%d", -12345, "-12345" },
|
||||
FmtTest{ "%10d", 12345, " 12345" },
|
||||
FmtTest{ "%10d", -12345, " -12345" },
|
||||
FmtTest{ "%+10d", 12345, " +12345" },
|
||||
FmtTest{ "%010d", 12345, "0000012345" },
|
||||
FmtTest{ "%010d", -12345, "-000012345" },
|
||||
FmtTest{ "%-10d", 12345, "12345 " },
|
||||
FmtTest{ "%010.3d", 1, " 001" },
|
||||
FmtTest{ "%010.3d", -1, " -001" },
|
||||
FmtTest{ "%+d", 12345, "+12345" },
|
||||
FmtTest{ "%+d", -12345, "-12345" },
|
||||
FmtTest{ "% d", 12345, " 12345" },
|
||||
FmtTest{ "% d", -12345, "-12345" },
|
||||
fmtTest{ "%d", 12345, "12345" },
|
||||
fmtTest{ "%d", -12345, "-12345" },
|
||||
fmtTest{ "%10d", 12345, " 12345" },
|
||||
fmtTest{ "%10d", -12345, " -12345" },
|
||||
fmtTest{ "%+10d", 12345, " +12345" },
|
||||
fmtTest{ "%010d", 12345, "0000012345" },
|
||||
fmtTest{ "%010d", -12345, "-000012345" },
|
||||
fmtTest{ "%-10d", 12345, "12345 " },
|
||||
fmtTest{ "%010.3d", 1, " 001" },
|
||||
fmtTest{ "%010.3d", -1, " -001" },
|
||||
fmtTest{ "%+d", 12345, "+12345" },
|
||||
fmtTest{ "%+d", -12345, "-12345" },
|
||||
fmtTest{ "% d", 12345, " 12345" },
|
||||
fmtTest{ "% d", -12345, "-12345" },
|
||||
|
||||
// arrays
|
||||
// TODO: when arrays work in interfaces, enable this line
|
||||
// and delete the TestArrayPrinter routine below
|
||||
// FmtTest{ "%v", array, "[1 2 3 4 5]" },
|
||||
FmtTest{ "%v", &array, "&[1 2 3 4 5]" },
|
||||
// fmtTest{ "%v", array, "[1 2 3 4 5]" },
|
||||
fmtTest{ "%v", &array, "&[1 2 3 4 5]" },
|
||||
|
||||
// old test/fmt_test.go
|
||||
FmtTest{ "%d", 1234, "1234" },
|
||||
FmtTest{ "%d", -1234, "-1234" },
|
||||
FmtTest{ "%d", uint(1234), "1234" },
|
||||
FmtTest{ "%d", uint32(B32), "4294967295" },
|
||||
FmtTest{ "%d", uint64(B64), "18446744073709551615" },
|
||||
FmtTest{ "%o", 01234, "1234" },
|
||||
FmtTest{ "%o", uint32(B32), "37777777777" },
|
||||
FmtTest{ "%o", uint64(B64), "1777777777777777777777" },
|
||||
FmtTest{ "%x", 0x1234abcd, "1234abcd" },
|
||||
FmtTest{ "%x", B32-0x1234567, "fedcba98" },
|
||||
FmtTest{ "%X", 0x1234abcd, "1234ABCD" },
|
||||
FmtTest{ "%X", B32-0x1234567, "FEDCBA98" },
|
||||
FmtTest{ "%x", B64, "ffffffffffffffff" },
|
||||
FmtTest{ "%b", 7, "111" },
|
||||
FmtTest{ "%b", B64, "1111111111111111111111111111111111111111111111111111111111111111" },
|
||||
FmtTest{ "%e", float64(1), "1.000000e+00" },
|
||||
FmtTest{ "%e", float64(1234.5678e3), "1.234568e+06" },
|
||||
FmtTest{ "%e", float64(1234.5678e-8), "1.234568e-05" },
|
||||
FmtTest{ "%e", float64(-7), "-7.000000e+00" },
|
||||
FmtTest{ "%e", float64(-1e-9), "-1.000000e-09" },
|
||||
FmtTest{ "%f", float64(1234.5678e3), "1234567.800000" },
|
||||
FmtTest{ "%f", float64(1234.5678e-8), "0.000012" },
|
||||
FmtTest{ "%f", float64(-7), "-7.000000" },
|
||||
FmtTest{ "%f", float64(-1e-9), "-0.000000" },
|
||||
FmtTest{ "%g", float64(1234.5678e3), "1.2345678e+06" },
|
||||
FmtTest{ "%g", float32(1234.5678e3), "1.2345678e+06" },
|
||||
FmtTest{ "%g", float64(1234.5678e-8), "1.2345678e-05" },
|
||||
FmtTest{ "%g", float64(-7), "-7" },
|
||||
FmtTest{ "%g", float64(-1e-9), "-1e-09", },
|
||||
FmtTest{ "%g", float32(-1e-9), "-1e-09" },
|
||||
FmtTest{ "%c", 'x', "x" },
|
||||
FmtTest{ "%c", 0xe4, "ä" },
|
||||
FmtTest{ "%c", 0x672c, "本" },
|
||||
FmtTest{ "%c", '日', "日" },
|
||||
FmtTest{ "%20.8d", 1234, " 00001234" },
|
||||
FmtTest{ "%20.8d", -1234, " -00001234" },
|
||||
FmtTest{ "%20d", 1234, " 1234" },
|
||||
FmtTest{ "%-20.8d", 1234, "00001234 " },
|
||||
FmtTest{ "%-20.8d", -1234, "-00001234 " },
|
||||
FmtTest{ "%.20b", 7, "00000000000000000111" },
|
||||
FmtTest{ "%20.5s", "qwertyuiop", " qwert" },
|
||||
FmtTest{ "%.5s", "qwertyuiop", "qwert" },
|
||||
FmtTest{ "%-20.5s", "qwertyuiop", "qwert " },
|
||||
FmtTest{ "%20c", 'x', " x" },
|
||||
FmtTest{ "%-20c", 'x', "x " },
|
||||
FmtTest{ "%20.6e", 1.2345e3, " 1.234500e+03" },
|
||||
FmtTest{ "%20.6e", 1.2345e-3, " 1.234500e-03" },
|
||||
FmtTest{ "%20e", 1.2345e3, " 1.234500e+03" },
|
||||
FmtTest{ "%20e", 1.2345e-3, " 1.234500e-03" },
|
||||
FmtTest{ "%20.8e", 1.2345e3, " 1.23450000e+03" },
|
||||
FmtTest{ "%20f", float64(1.23456789e3), " 1234.567890" },
|
||||
FmtTest{ "%20f", float64(1.23456789e-3), " 0.001235" },
|
||||
FmtTest{ "%20f", float64(12345678901.23456789), " 12345678901.234568" },
|
||||
FmtTest{ "%-20f", float64(1.23456789e3), "1234.567890 " },
|
||||
FmtTest{ "%20.8f", float64(1.23456789e3), " 1234.56789000" },
|
||||
FmtTest{ "%20.8f", float64(1.23456789e-3), " 0.00123457" },
|
||||
FmtTest{ "%g", float64(1.23456789e3), "1234.56789" },
|
||||
FmtTest{ "%g", float64(1.23456789e-3), "0.00123456789" },
|
||||
FmtTest{ "%g", float64(1.23456789e20), "1.23456789e+20" },
|
||||
FmtTest{ "%20e", sys.Inf(1), " +Inf" },
|
||||
FmtTest{ "%-20f", sys.Inf(-1), "-Inf " },
|
||||
FmtTest{ "%20g", sys.NaN(), " NaN" },
|
||||
fmtTest{ "%d", 1234, "1234" },
|
||||
fmtTest{ "%d", -1234, "-1234" },
|
||||
fmtTest{ "%d", uint(1234), "1234" },
|
||||
fmtTest{ "%d", uint32(b32), "4294967295" },
|
||||
fmtTest{ "%d", uint64(b64), "18446744073709551615" },
|
||||
fmtTest{ "%o", 01234, "1234" },
|
||||
fmtTest{ "%o", uint32(b32), "37777777777" },
|
||||
fmtTest{ "%o", uint64(b64), "1777777777777777777777" },
|
||||
fmtTest{ "%x", 0x1234abcd, "1234abcd" },
|
||||
fmtTest{ "%x", b32-0x1234567, "fedcba98" },
|
||||
fmtTest{ "%X", 0x1234abcd, "1234ABCD" },
|
||||
fmtTest{ "%X", b32-0x1234567, "FEDCBA98" },
|
||||
fmtTest{ "%x", b64, "ffffffffffffffff" },
|
||||
fmtTest{ "%b", 7, "111" },
|
||||
fmtTest{ "%b", b64, "1111111111111111111111111111111111111111111111111111111111111111" },
|
||||
fmtTest{ "%e", float64(1), "1.000000e+00" },
|
||||
fmtTest{ "%e", float64(1234.5678e3), "1.234568e+06" },
|
||||
fmtTest{ "%e", float64(1234.5678e-8), "1.234568e-05" },
|
||||
fmtTest{ "%e", float64(-7), "-7.000000e+00" },
|
||||
fmtTest{ "%e", float64(-1e-9), "-1.000000e-09" },
|
||||
fmtTest{ "%f", float64(1234.5678e3), "1234567.800000" },
|
||||
fmtTest{ "%f", float64(1234.5678e-8), "0.000012" },
|
||||
fmtTest{ "%f", float64(-7), "-7.000000" },
|
||||
fmtTest{ "%f", float64(-1e-9), "-0.000000" },
|
||||
fmtTest{ "%g", float64(1234.5678e3), "1.2345678e+06" },
|
||||
fmtTest{ "%g", float32(1234.5678e3), "1.2345678e+06" },
|
||||
fmtTest{ "%g", float64(1234.5678e-8), "1.2345678e-05" },
|
||||
fmtTest{ "%g", float64(-7), "-7" },
|
||||
fmtTest{ "%g", float64(-1e-9), "-1e-09", },
|
||||
fmtTest{ "%g", float32(-1e-9), "-1e-09" },
|
||||
fmtTest{ "%c", 'x', "x" },
|
||||
fmtTest{ "%c", 0xe4, "ä" },
|
||||
fmtTest{ "%c", 0x672c, "本" },
|
||||
fmtTest{ "%c", '日', "日" },
|
||||
fmtTest{ "%20.8d", 1234, " 00001234" },
|
||||
fmtTest{ "%20.8d", -1234, " -00001234" },
|
||||
fmtTest{ "%20d", 1234, " 1234" },
|
||||
fmtTest{ "%-20.8d", 1234, "00001234 " },
|
||||
fmtTest{ "%-20.8d", -1234, "-00001234 " },
|
||||
fmtTest{ "%.20b", 7, "00000000000000000111" },
|
||||
fmtTest{ "%20.5s", "qwertyuiop", " qwert" },
|
||||
fmtTest{ "%.5s", "qwertyuiop", "qwert" },
|
||||
fmtTest{ "%-20.5s", "qwertyuiop", "qwert " },
|
||||
fmtTest{ "%20c", 'x', " x" },
|
||||
fmtTest{ "%-20c", 'x', "x " },
|
||||
fmtTest{ "%20.6e", 1.2345e3, " 1.234500e+03" },
|
||||
fmtTest{ "%20.6e", 1.2345e-3, " 1.234500e-03" },
|
||||
fmtTest{ "%20e", 1.2345e3, " 1.234500e+03" },
|
||||
fmtTest{ "%20e", 1.2345e-3, " 1.234500e-03" },
|
||||
fmtTest{ "%20.8e", 1.2345e3, " 1.23450000e+03" },
|
||||
fmtTest{ "%20f", float64(1.23456789e3), " 1234.567890" },
|
||||
fmtTest{ "%20f", float64(1.23456789e-3), " 0.001235" },
|
||||
fmtTest{ "%20f", float64(12345678901.23456789), " 12345678901.234568" },
|
||||
fmtTest{ "%-20f", float64(1.23456789e3), "1234.567890 " },
|
||||
fmtTest{ "%20.8f", float64(1.23456789e3), " 1234.56789000" },
|
||||
fmtTest{ "%20.8f", float64(1.23456789e-3), " 0.00123457" },
|
||||
fmtTest{ "%g", float64(1.23456789e3), "1234.56789" },
|
||||
fmtTest{ "%g", float64(1.23456789e-3), "0.00123456789" },
|
||||
fmtTest{ "%g", float64(1.23456789e20), "1.23456789e+20" },
|
||||
fmtTest{ "%20e", sys.Inf(1), " +Inf" },
|
||||
fmtTest{ "%-20f", sys.Inf(-1), "-Inf " },
|
||||
fmtTest{ "%20g", sys.NaN(), " NaN" },
|
||||
}
|
||||
|
||||
export func TestSprintf(t *testing.T) {
|
||||
|
|
@ -166,8 +166,8 @@ export func TestSprintf(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
type FlagPrinter struct { }
|
||||
func (*FlagPrinter) Format(f fmt.Formatter, c int) {
|
||||
type flagPrinter struct { }
|
||||
func (*flagPrinter) Format(f fmt.Formatter, c int) {
|
||||
s := "%";
|
||||
for i := 0; i < 128; i++ {
|
||||
if f.Flag(i) {
|
||||
|
|
@ -184,28 +184,28 @@ func (*FlagPrinter) Format(f fmt.Formatter, c int) {
|
|||
io.WriteString(f, "["+s+"]");
|
||||
}
|
||||
|
||||
type FlagTest struct {
|
||||
type flagTest struct {
|
||||
in string;
|
||||
out string;
|
||||
}
|
||||
|
||||
var flagtests = []FlagTest {
|
||||
FlagTest{ "%a", "[%a]" },
|
||||
FlagTest{ "%-a", "[%-a]" },
|
||||
FlagTest{ "%+a", "[%+a]" },
|
||||
FlagTest{ "%#a", "[%#a]" },
|
||||
FlagTest{ "% a", "[% a]" },
|
||||
FlagTest{ "%0a", "[%0a]" },
|
||||
FlagTest{ "%1.2a", "[%1.2a]" },
|
||||
FlagTest{ "%-1.2a", "[%-1.2a]" },
|
||||
FlagTest{ "%+1.2a", "[%+1.2a]" },
|
||||
FlagTest{ "%-+1.2a", "[%+-1.2a]" },
|
||||
FlagTest{ "%-+1.2abc", "[%+-1.2a]bc" },
|
||||
FlagTest{ "%-1.2abc", "[%-1.2a]bc" },
|
||||
var flagtests = []flagTest {
|
||||
flagTest{ "%a", "[%a]" },
|
||||
flagTest{ "%-a", "[%-a]" },
|
||||
flagTest{ "%+a", "[%+a]" },
|
||||
flagTest{ "%#a", "[%#a]" },
|
||||
flagTest{ "% a", "[% a]" },
|
||||
flagTest{ "%0a", "[%0a]" },
|
||||
flagTest{ "%1.2a", "[%1.2a]" },
|
||||
flagTest{ "%-1.2a", "[%-1.2a]" },
|
||||
flagTest{ "%+1.2a", "[%+1.2a]" },
|
||||
flagTest{ "%-+1.2a", "[%+-1.2a]" },
|
||||
flagTest{ "%-+1.2abc", "[%+-1.2a]bc" },
|
||||
flagTest{ "%-1.2abc", "[%-1.2a]bc" },
|
||||
}
|
||||
|
||||
export func TestFlagParser(t *testing.T) {
|
||||
var flagprinter FlagPrinter;
|
||||
var flagprinter flagPrinter;
|
||||
for i := 0; i < len(flagtests); i++ {
|
||||
tt := flagtests[i];
|
||||
s := fmt.Sprintf(tt.in, &flagprinter);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue