From 471552e81e198e81193f3b19abb61f901a27710a Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 8 Mar 2013 19:54:27 -0600 Subject: [PATCH] Modify printInt and printUint to accept base. This paves the way to improve how byte arrays are output as well as increases the flexibily of the functions. --- spew/common.go | 8 ++++---- spew/dump.go | 4 ++-- spew/format.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spew/common.go b/spew/common.go index 7bea858..e452260 100644 --- a/spew/common.go +++ b/spew/common.go @@ -186,13 +186,13 @@ func printBool(w io.Writer, val bool) { } // printInt outputs a signed integer value to Writer w. -func printInt(w io.Writer, val int64) { - w.Write([]byte(strconv.FormatInt(val, 10))) +func printInt(w io.Writer, val int64, base int) { + w.Write([]byte(strconv.FormatInt(val, base))) } // printUint outputs an unsigned integer value to Writer w. -func printUint(w io.Writer, val uint64) { - w.Write([]byte(strconv.FormatUint(val, 10))) +func printUint(w io.Writer, val uint64, base int) { + w.Write([]byte(strconv.FormatUint(val, base))) } // printFloat outputs a floating point value using the specified precision, diff --git a/spew/dump.go b/spew/dump.go index 57572c6..779bace 100644 --- a/spew/dump.go +++ b/spew/dump.go @@ -182,10 +182,10 @@ func (d *dumpState) dump(v reflect.Value) { printBool(d.w, v.Bool()) case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int: - printInt(d.w, v.Int()) + printInt(d.w, v.Int(), 10) case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint: - printUint(d.w, v.Uint()) + printUint(d.w, v.Uint(), 10) case reflect.Float32: printFloat(d.w, v.Float(), 32) diff --git a/spew/format.go b/spew/format.go index ca695fe..fc1d3ae 100644 --- a/spew/format.go +++ b/spew/format.go @@ -237,10 +237,10 @@ func (f *formatState) format(v reflect.Value) { printBool(f.fs, v.Bool()) case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int: - printInt(f.fs, v.Int()) + printInt(f.fs, v.Int(), 10) case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint: - printUint(f.fs, v.Uint()) + printUint(f.fs, v.Uint(), 10) case reflect.Float32: printFloat(f.fs, v.Float(), 32)