Skip to content

G
go
Commit 8f2bf201 authored by Russ Cox's avatar Russ Cox
Browse files
Options

fix indentation 

R=r
DELTA=166  (0 added, 0 deleted, 166 changed)
OCL=34521
CL=34527
parent 61f27d3c
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 146 deletions
src/pkg/fmt/print.go
View file @ 8f2bf201
...@@ -666,172 +666,172 @@ func (p *pp) doprintf(format string, v *reflect.StructValue) { ...@@ -666,172 +666,172 @@ func (p *pp) doprintf(format string, v *reflect.StructValue) {
s := ""; s := "";
switch c { switch c {
// bool // bool
case 't': case 't':
if v, ok := getBool(field); ok { if v, ok := getBool(field); ok {
if v { if v {
s = "true"; s = "true";
} else {
s = "false";
}
} else { } else {
goto badtype; s = "false";
} }
} else {
goto badtype;
}
// int // int
case 'b': case 'b':
if v, signed, ok := getInt(field); ok { if v, signed, ok := getInt(field); ok {
s = p.fmt.Fmt_b64(uint64(v)).Str() // always unsigned s = p.fmt.Fmt_b64(uint64(v)).Str() // always unsigned
} else if v, ok := getFloat32(field); ok { } else if v, ok := getFloat32(field); ok {
s = p.fmt.Fmt_fb32(v).Str() s = p.fmt.Fmt_fb32(v).Str()
} else if v, ok := getFloat64(field); ok { } else if v, ok := getFloat64(field); ok {
s = p.fmt.Fmt_fb64(v).Str() s = p.fmt.Fmt_fb64(v).Str()
} else { } else {
goto badtype goto badtype
} }
case 'c': case 'c':
if v, signed, ok := getInt(field); ok { if v, signed, ok := getInt(field); ok {
s = p.fmt.Fmt_c(int(v)).Str() s = p.fmt.Fmt_c(int(v)).Str()
} else { } else {
goto badtype goto badtype
} }
case 'd': case 'd':
if v, signed, ok := getInt(field); ok { if v, signed, ok := getInt(field); ok {
if signed { if signed {
s = p.fmt.Fmt_d64(v).Str() s = p.fmt.Fmt_d64(v).Str()
} else {
s = p.fmt.Fmt_ud64(uint64(v)).Str()
}
} else { } else {
goto badtype s = p.fmt.Fmt_ud64(uint64(v)).Str()
} }
case 'o': } else {
if v, signed, ok := getInt(field); ok { goto badtype
if signed { }
s = p.fmt.Fmt_o64(v).Str() case 'o':
} else { if v, signed, ok := getInt(field); ok {
s = p.fmt.Fmt_uo64(uint64(v)).Str() if signed {
} s = p.fmt.Fmt_o64(v).Str()
} else { } else {
goto badtype s = p.fmt.Fmt_uo64(uint64(v)).Str()
} }
case 'x': } else {
if v, signed, ok := getInt(field); ok { goto badtype
if signed { }
s = p.fmt.Fmt_x64(v).Str() case 'x':
} else { if v, signed, ok := getInt(field); ok {
s = p.fmt.Fmt_ux64(uint64(v)).Str() if signed {
} s = p.fmt.Fmt_x64(v).Str()
} else if v, ok := getString(field); ok {
s = p.fmt.Fmt_sx(v).Str();
} else { } else {
goto badtype s = p.fmt.Fmt_ux64(uint64(v)).Str()
} }
case 'X': } else if v, ok := getString(field); ok {
if v, signed, ok := getInt(field); ok { s = p.fmt.Fmt_sx(v).Str();
if signed { } else {
s = p.fmt.Fmt_X64(v).Str() goto badtype
} else { }
s = p.fmt.Fmt_uX64(uint64(v)).Str() case 'X':
} if v, signed, ok := getInt(field); ok {
} else if v, ok := getString(field); ok { if signed {
s = p.fmt.Fmt_sX(v).Str(); s = p.fmt.Fmt_X64(v).Str()
} else { } else {
goto badtype s = p.fmt.Fmt_uX64(uint64(v)).Str()
} }
} else if v, ok := getString(field); ok {
s = p.fmt.Fmt_sX(v).Str();
} else {
goto badtype
}
// float // float
case 'e': case 'e':
if v, ok := getFloat32(field); ok { if v, ok := getFloat32(field); ok {
s = p.fmt.Fmt_e32(v).Str() s = p.fmt.Fmt_e32(v).Str()
} else if v, ok := getFloat64(field); ok { } else if v, ok := getFloat64(field); ok {
s = p.fmt.Fmt_e64(v).Str() s = p.fmt.Fmt_e64(v).Str()
} else { } else {
goto badtype goto badtype
} }
case 'E': case 'E':
if v, ok := getFloat32(field); ok { if v, ok := getFloat32(field); ok {
s = p.fmt.Fmt_E32(v).Str() s = p.fmt.Fmt_E32(v).Str()
} else if v, ok := getFloat64(field); ok { } else if v, ok := getFloat64(field); ok {
s = p.fmt.Fmt_E64(v).Str() s = p.fmt.Fmt_E64(v).Str()
} else { } else {
goto badtype goto badtype
} }
case 'f': case 'f':
if v, ok := getFloat32(field); ok { if v, ok := getFloat32(field); ok {
s = p.fmt.Fmt_f32(v).Str() s = p.fmt.Fmt_f32(v).Str()
} else if v, ok := getFloat64(field); ok { } else if v, ok := getFloat64(field); ok {
s = p.fmt.Fmt_f64(v).Str() s = p.fmt.Fmt_f64(v).Str()
} else { } else {
goto badtype goto badtype
} }
case 'g': case 'g':
if v, ok := getFloat32(field); ok { if v, ok := getFloat32(field); ok {
s = p.fmt.Fmt_g32(v).Str() s = p.fmt.Fmt_g32(v).Str()
} else if v, ok := getFloat64(field); ok { } else if v, ok := getFloat64(field); ok {
s = p.fmt.Fmt_g64(v).Str() s = p.fmt.Fmt_g64(v).Str()
} else { } else {
goto badtype goto badtype
} }
case 'G': case 'G':
if v, ok := getFloat32(field); ok { if v, ok := getFloat32(field); ok {
s = p.fmt.Fmt_G32(v).Str() s = p.fmt.Fmt_G32(v).Str()
} else if v, ok := getFloat64(field); ok { } else if v, ok := getFloat64(field); ok {
s = p.fmt.Fmt_G64(v).Str() s = p.fmt.Fmt_G64(v).Str()
} else { } else {
goto badtype goto badtype
} }
// string // string
case 's': case 's':
if inter != nil { if inter != nil {
// if object implements String, use the result. // if object implements String, use the result.
if stringer, ok := inter.(Stringer); ok { if stringer, ok := inter.(Stringer); ok {
s = p.fmt.Fmt_s(stringer.String()).Str(); s = p.fmt.Fmt_s(stringer.String()).Str();
break; break;
}
}
if v, ok := getString(field); ok {
s = p.fmt.Fmt_s(v).Str()
} else {
goto badtype
}
case 'q':
if v, ok := getString(field); ok {
s = p.fmt.Fmt_q(v).Str()
} else {
goto badtype
} }
}
if v, ok := getString(field); ok {
s = p.fmt.Fmt_s(v).Str()
} else {
goto badtype
}
case 'q':
if v, ok := getString(field); ok {
s = p.fmt.Fmt_q(v).Str()
} else {
goto badtype
}
// pointer // pointer
case 'p': case 'p':
if v, ok := getPtr(field); ok { if v, ok := getPtr(field); ok {
if v == 0 { if v == 0 {
s = "<nil>" s = "<nil>"
} else {
s = "0x" + p.fmt.Fmt_uX64(uint64(v)).Str()
}
} else { } else {
goto badtype s = "0x" + p.fmt.Fmt_uX64(uint64(v)).Str()
} }
} else {
goto badtype
}
// arbitrary value; do your best // arbitrary value; do your best
case 'v': case 'v':
plus, sharp := p.fmt.plus, p.fmt.sharp; plus, sharp := p.fmt.plus, p.fmt.sharp;
p.fmt.plus = false; p.fmt.plus = false;
p.fmt.sharp = false; p.fmt.sharp = false;
p.printField(field, plus, sharp, 0); p.printField(field, plus, sharp, 0);
// the value's type // the value's type
case 'T': case 'T':
s = field.Type().String(); s = field.Type().String();
default: default:
badtype: badtype:
s = "%" + string(c) + "(" + field.Type().String() + "="; s = "%" + string(c) + "(" + field.Type().String() + "=";
p.addstr(s); p.addstr(s);
p.printField(field, false, false, 0); p.printField(field, false, false, 0);
s = ")"; s = ")";
} }
p.addstr(s); p.addstr(s);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7